diff --git a/bin/nova-compute b/bin/nova-compute
index cf9de9bb..cc4c9e2f 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -21,12 +21,12 @@
   Twistd daemon for the nova compute nodes.
 """
 
+from nova import service
 from nova import twistd
-from nova.compute import service
 
 
 if __name__ == '__main__':
     twistd.serve(__file__)
 
 if __name__ == '__builtin__':
-    application = service.ComputeService.create()  # pylint: disable=C0103
+    application = service.Service.create()  # pylint: disable=C0103
diff --git a/bin/nova-network b/bin/nova-network
index 6434b6ec..040b35e0 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -21,16 +21,12 @@
   Twistd daemon for the nova network nodes.
 """
 
-from nova import flags
+from nova import service
 from nova import twistd
 
-from nova.network import service
-
-FLAGS = flags.FLAGS
-
 
 if __name__ == '__main__':
     twistd.serve(__file__)
 
 if __name__ == '__builtin__':
-    application = service.NetworkService.create()  # pylint: disable-msg=C0103
+    application = service.Service.create()  # pylint: disable-msg=C0103
diff --git a/bin/nova-volume b/bin/nova-volume
index 25b5871a..fac4b5d0 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -21,12 +21,12 @@
   Twistd daemon for the nova volume nodes.
 """
 
+from nova import service
 from nova import twistd
-from nova.volume import service
 
 
 if __name__ == '__main__':
     twistd.serve(__file__)
 
 if __name__ == '__builtin__':
-    application = service.VolumeService.create()  # pylint: disable-msg=C0103
+    application = service.Service.create()  # pylint: disable-msg=C0103