diff --git a/core-modules/006QubesDom0NetVm.py b/core-modules/006QubesAdminVm.py
similarity index 93%
rename from core-modules/006QubesDom0NetVm.py
rename to core-modules/006QubesAdminVm.py
index 43251e48..24274f91 100644
--- a/core-modules/006QubesDom0NetVm.py
+++ b/core-modules/006QubesAdminVm.py
@@ -25,13 +25,13 @@ from qubes.qubes import QubesNetVm,register_qubes_vm_class,xl_ctx,xc
 from qubes.qubes import defaults
 from qubes.qubes import QubesException,dry_run
 
-class QubesDom0NetVm(QubesNetVm):
+class QubesAdminVm(QubesNetVm):
 
     # In which order load this VM type from qubes.xml
     load_order = 10
 
     def __init__(self, **kwargs):
-        super(QubesDom0NetVm, self).__init__(qid=0, name="dom0", netid=0,
+        super(QubesAdminVm, self).__init__(qid=0, name="dom0", netid=0,
                                              dir_path=None,
                                              private_img = None,
                                              template = None,
@@ -41,7 +41,7 @@ class QubesDom0NetVm(QubesNetVm):
 
     @property
     def type(self):
-        return "Dom0NetVM"
+        return "AdminVM"
 
     def is_running(self):
         return True
@@ -94,4 +94,4 @@ class QubesDom0NetVm(QubesNetVm):
     def verify_files(self):
         return True
 
-register_qubes_vm_class(QubesDom0NetVm)
+register_qubes_vm_class(QubesAdminVm)
diff --git a/core/qubes.py b/core/qubes.py
index 0532b1de..743ae15f 100755
--- a/core/qubes.py
+++ b/core/qubes.py
@@ -660,7 +660,7 @@ class QubesVmCollection(dict):
 
         # Add dom0 if wasn't present in qubes.xml
         if not 0 in self.keys():
-            dom0vm = QubesDom0NetVm (collection=self)
+            dom0vm = QubesAdminVm (collection=self)
             self[dom0vm.qid] = dom0vm
 
         return True