diff --git a/tuitest.py b/apparatinterface.py
similarity index 100%
rename from tuitest.py
rename to apparatinterface.py
diff --git a/configreader.py b/configreader.py
index 7852f41..fa4a129 100644
--- a/configreader.py
+++ b/configreader.py
@@ -1,9 +1,9 @@
 
 import csv
 import ConfigParser
-import tuitest
+import apparatinterface
 import phoneinterface
-import fetapdtest
+import fetapd
 
 class ConfigurationReader(object):
 	DEFAULTS = {
@@ -70,7 +70,7 @@ class ConfigurationReader(object):
 		self.__cp.read(f)
 
 		print 'pin_nsa:', self.__get_global_val_int('pin_nsa'),
-		self.__pinconfig = tuitest.FeApPinConfiguration(
+		self.__pinconfig = apparatinterface.FeApPinConfiguration(
 			gpio_numbering = self.__get_global_val('gpio_numbering'),
 			pin_nsa = self.__get_global_val_int('pin_nsa'),
 			pin_nsi = self.__get_global_val_int('pin_nsi'),
@@ -82,7 +82,7 @@ class ConfigurationReader(object):
 			invert_gs = self.__get_global_val_bool('invert_gs'),
 		)
 
-		self.__dialconfig = fetapdtest.DialConfiguration(
+		self.__dialconfig = fetapd.DialConfiguration(
 			self.__get_global_val_int('dial_timeout'),
 			self.__read_shortcuts(),
 			self.__read_blacklist(),
diff --git a/fetapdtest.py b/fetapd.py
similarity index 99%
rename from fetapdtest.py
rename to fetapd.py
index 5df43a3..809f940 100644
--- a/fetapdtest.py
+++ b/fetapd.py
@@ -2,7 +2,7 @@ import time
 import threading
 import Queue as queue
 from phoneinterface import PhoneInterface, PhoneEvent
-from tuitest import FeApPinConfiguration, FeApUserInterface
+from apparatinterface import FeApPinConfiguration, FeApUserInterface
 import configreader