diff --git a/riscof/config.ini b/riscof/config.ini
index 3f7c37e..a49317f 100644
--- a/riscof/config.ini
+++ b/riscof/config.ini
@@ -1,13 +1,13 @@
 [RISCOF]
 ReferencePlugin=sail_cSim
 ReferencePluginPath=sail_cSim
-DUTPlugin=test-dut
-DUTPluginPath=test-dut
+DUTPlugin=test_dut
+DUTPluginPath=test_dut
 
-[test-dut]
-pluginpath=test-dut
-ispec=test-dut/test-dut_isa.yaml
-pspec=test-dut/test-dut_platform.yaml
+[test_dut]
+pluginpath=test_dut
+ispec=test_dut/test_dut_isa.yaml
+pspec=test_dut/test_dut_platform.yaml
 target_run=1
 PATH=../target/debug/riscv
 
diff --git a/riscof/test-dut/env/link.ld b/riscof/test_dut/env/link.ld
similarity index 100%
rename from riscof/test-dut/env/link.ld
rename to riscof/test_dut/env/link.ld
diff --git a/riscof/test-dut/env/model_test.h b/riscof/test_dut/env/model_test.h
similarity index 100%
rename from riscof/test-dut/env/model_test.h
rename to riscof/test_dut/env/model_test.h
diff --git a/riscof/test-dut/riscof_test-dut.py b/riscof/test_dut/riscof_test_dut.py
similarity index 99%
rename from riscof/test-dut/riscof_test-dut.py
rename to riscof/test_dut/riscof_test_dut.py
index 978830f..d1912f9 100644
--- a/riscof/test-dut/riscof_test-dut.py
+++ b/riscof/test_dut/riscof_test_dut.py
@@ -16,7 +16,7 @@
 
 logger = logging.getLogger()
 
-class test-dut(pluginTemplate):
+class test_dut(pluginTemplate):
     __model__ = "riscv"
 
     #TODO: please update the below to indicate family, version, etc of your DUT.
@@ -92,7 +92,7 @@ def build(self, isa_yaml, platform_yaml):
       # will be useful in setting integer value in the compiler string (if not already hardcoded);
       self.xlen = ('64' if 64 in ispec['supported_xlen'] else '32')
 
-      # for test-dut start building the '--isa' argument. the self.isa is dutnmae specific and may not be
+      # for test_dut start building the '--isa' argument. the self.isa is dutnmae specific and may not be
       # useful for all DUTs
       self.isa = 'rv' + self.xlen
       if "I" in ispec["ISA"]:
diff --git a/riscof/test-dut/test-dut_isa.yaml b/riscof/test_dut/test_dut_isa.yaml
similarity index 100%
rename from riscof/test-dut/test-dut_isa.yaml
rename to riscof/test_dut/test_dut_isa.yaml
diff --git a/riscof/test-dut/test-dut_platform.yaml b/riscof/test_dut/test_dut_platform.yaml
similarity index 100%
rename from riscof/test-dut/test-dut_platform.yaml
rename to riscof/test_dut/test_dut_platform.yaml