diff --git a/tools/oneclick/prestudy/YAML/bf_unit/peripheral.cfg b/tools/oneclick/prestudy/YAML/bf_unit/peripheral.yaml
similarity index 100%
rename from tools/oneclick/prestudy/YAML/bf_unit/peripheral.cfg
rename to tools/oneclick/prestudy/YAML/bf_unit/peripheral.yaml
diff --git a/tools/oneclick/prestudy/YAML/fringe_stop/peripheral.cfg b/tools/oneclick/prestudy/YAML/fringe_stop/peripheral.yaml
similarity index 100%
rename from tools/oneclick/prestudy/YAML/fringe_stop/peripheral.cfg
rename to tools/oneclick/prestudy/YAML/fringe_stop/peripheral.yaml
diff --git a/tools/oneclick/prestudy/YAML/mms_diag_block_gen/peripheral.cfg b/tools/oneclick/prestudy/YAML/mms_diag_block_gen/peripheral.yaml
similarity index 100%
rename from tools/oneclick/prestudy/YAML/mms_diag_block_gen/peripheral.cfg
rename to tools/oneclick/prestudy/YAML/mms_diag_block_gen/peripheral.yaml
diff --git a/tools/oneclick/prestudy/YAML/mms_diag_data_buffer/peripheral.cfg b/tools/oneclick/prestudy/YAML/mms_diag_data_buffer/peripheral.yaml
similarity index 100%
rename from tools/oneclick/prestudy/YAML/mms_diag_data_buffer/peripheral.cfg
rename to tools/oneclick/prestudy/YAML/mms_diag_data_buffer/peripheral.yaml
diff --git a/tools/oneclick/prestudy/YAML/mms_dp_bsn_align/peripheral.cfg b/tools/oneclick/prestudy/YAML/mms_dp_bsn_align/peripheral.yaml
similarity index 100%
rename from tools/oneclick/prestudy/YAML/mms_dp_bsn_align/peripheral.cfg
rename to tools/oneclick/prestudy/YAML/mms_dp_bsn_align/peripheral.yaml
diff --git a/tools/oneclick/prestudy/YAML/mms_dp_fifo_fill/peripheral.cfg b/tools/oneclick/prestudy/YAML/mms_dp_fifo_fill/peripheral.yaml
similarity index 100%
rename from tools/oneclick/prestudy/YAML/mms_dp_fifo_fill/peripheral.cfg
rename to tools/oneclick/prestudy/YAML/mms_dp_fifo_fill/peripheral.yaml
diff --git a/tools/oneclick/prestudy/YAML/peripheral.py b/tools/oneclick/prestudy/YAML/peripheral.py
index 9a358fb93b78f31330610cdaa07a4b75c1c46350..5948d3ac6f11a8ffdfb927e0d6ea9e8ac42a137f 100644
--- a/tools/oneclick/prestudy/YAML/peripheral.py
+++ b/tools/oneclick/prestudy/YAML/peripheral.py
@@ -167,7 +167,7 @@ class Peripheral:
         
 class PeripheralLibrary:
 
-    def __init__(self, rootDir, fileName='peripheral.cfg'):
+    def __init__(self, rootDir, fileName='peripheral.yaml'):
         """Store the dictionaries from all fileName files in rootDir."""
         self.rootDir = rootDir
         self.fileName = fileName                                   # all peripheral files have the same fileName
@@ -248,7 +248,7 @@ class System(Peripheral):
         Peripheral.__init__(self, None, 1, None)
         self.filePathName = filePathName
         self.rootDir      = os.environ['RADIOHDL'] + "/tools/oneclick/prestudy/YAML"        
-        self.peri_lib     = PeripheralLibrary( self.rootDir, "peripheral.cfg")        
+        self.peri_lib     = PeripheralLibrary( self.rootDir, "peripheral.yaml")        
         self.peripherals  = []
         
         if filePathName==None: 
diff --git a/tools/oneclick/prestudy/YAML/read_yaml.py b/tools/oneclick/prestudy/YAML/read_yaml.py
index 6465254fa1da9011b112df22f30b8af9b5cf8ed2..d985ff99c327c5ed5baec1313e14750ec74faf5b 100644
--- a/tools/oneclick/prestudy/YAML/read_yaml.py
+++ b/tools/oneclick/prestudy/YAML/read_yaml.py
@@ -23,13 +23,13 @@
 ###############################################################################
 import peripheral
 import os     
-from common import *
+import common as cm
 
 rootDir  = os.environ['RADIOHDL'] + "/tools/oneclick/prestudy/YAML"
 
-#peri_lib = peripheral.PeripheralLibrary( rootDir, "peripheral.cfg")
+#peri_lib = peripheral.PeripheralLibrary( rootDir, "peripheral.yaml")
 
-system = peripheral.System( rootDir + "/system.cfg") 
+system = peripheral.System( rootDir + "/system.yaml") 
 
 system.display_system()
 
diff --git a/tools/oneclick/prestudy/YAML/system.cfg b/tools/oneclick/prestudy/YAML/system.yaml
similarity index 100%
rename from tools/oneclick/prestudy/YAML/system.cfg
rename to tools/oneclick/prestudy/YAML/system.yaml