diff --git a/script/testcommons.py b/script/testcommons.py
index 85db0dc..2093405 100644
--- a/script/testcommons.py
+++ b/script/testcommons.py
@@ -8,8 +8,8 @@ class TestingTool:
     testName = ''
     testPath = ''
     
-    def __init__(self, testName, testPath, DEVICE):
-        self.deviceName = DEVICE
+    def __init__(self, testName, testPath, deviceName):
+        self.deviceName = deviceName
         self.testName   = testName
         self.testPath   = testPath
         
@@ -17,16 +17,16 @@ class TestingTool:
         import time
         time.ctime()
         now = time.strftime('%Y.%m.%d %H:%M:%S') 
-        print now + ' ' + DEVICE + ' - ' + testName + ': ' + str(text)
+        print now + ' ' + self.deviceName + ' - ' + self.testName + ': ' + str(text)
         
     #prepare and send feedback to calling tool   
     def sendFeedback(self, returnString, testPassed):
-        print_log(testName, DEVICE,  'End of test. Result:')
-        print_log(testName, DEVICE,  'Device:        ' + self.deviceName)
-        print_log(testName, DEVICE,  'Test name:     ' + self.testName)
-        print_log(testName, DEVICE,  'Test path:     ' + self.testPath)
-        print_log(testName, DEVICE,  'Test passed:   ' + str(testPassed))
-        print_log(testName, DEVICE,  'Return string: ' + returnString)
+        print_log(self.testName, self.deviceName,  'End of test. Result:')
+        print_log(self.testName, self.deviceName,  'Device:        ' + self.deviceName)
+        print_log(self.testName, self.deviceName,  'Test name:     ' + self.testName)
+        print_log(self.testName, self.deviceName,  'Test path:     ' + self.testPath)
+        print_log(self.testName, self.deviceName,  'Test passed:   ' + str(testPassed))
+        print_log(self.testName, self.deviceName,  'Return string: ' + returnString)
         ret = [self.testPath, self.deviceName, returnString, testPassed]
         return ret