diff --git a/node-daemon/pvcd/Daemon.py b/node-daemon/pvcd/Daemon.py
index 6793e9aa..386afec9 100644
--- a/node-daemon/pvcd/Daemon.py
+++ b/node-daemon/pvcd/Daemon.py
@@ -49,7 +49,7 @@ import pvcd.zkhandler as zkhandler
 import pvcd.fencing as fencing
 import pvcd.common as common
 
-import pvcd.DomainInstance as DomainInstance
+import pvcd.VMInstance as VMInstance
 import pvcd.NodeInstance as NodeInstance
 import pvcd.VXNetworkInstance as VXNetworkInstance
 import pvcd.DNSAggregatorInstance as DNSAggregatorInstance
@@ -779,7 +779,7 @@ if enable_hypervisor:
         # Add any missing domains to the list
         for domain in new_domain_list:
             if not domain in domain_list:
-                d_domain[domain] = DomainInstance.DomainInstance(domain, zk_conn, config, logger, this_node)
+                d_domain[domain] = VMInstance.VMInstance(domain, zk_conn, config, logger, this_node)
 
         # Remove any deleted domains from the list
         for domain in domain_list:
diff --git a/node-daemon/pvcd/DomainConsoleWatcherInstance.py b/node-daemon/pvcd/VMConsoleWatcherInstance.py
similarity index 96%
rename from node-daemon/pvcd/DomainConsoleWatcherInstance.py
rename to node-daemon/pvcd/VMConsoleWatcherInstance.py
index 8d8aa9de..58c83486 100644
--- a/node-daemon/pvcd/DomainConsoleWatcherInstance.py
+++ b/node-daemon/pvcd/VMConsoleWatcherInstance.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# DomainConsoleWatcherInstance.py - Class implementing a console log watcher for PVC domains
+# VMConsoleWatcherInstance.py - Class implementing a console log watcher for PVC domains
 # Part of the Parallel Virtual Cluster (PVC) system
 #
 #    Copyright (C) 2018  Joshua M. Boniface <joshua@boniface.me>
@@ -35,7 +35,7 @@ import signal
 import pvcd.log as log
 import pvcd.zkhandler as zkhandler
 
-class DomainConsoleWatcherInstance(object):
+class VMConsoleWatcherInstance(object):
     # Initialization function
     def __init__(self, domuuid, domname, zk_conn, config, logger, this_node):
         self.domuuid = domuuid
diff --git a/node-daemon/pvcd/DomainInstance.py b/node-daemon/pvcd/VMInstance.py
similarity index 98%
rename from node-daemon/pvcd/DomainInstance.py
rename to node-daemon/pvcd/VMInstance.py
index a6263348..649fe9c7 100644
--- a/node-daemon/pvcd/DomainInstance.py
+++ b/node-daemon/pvcd/VMInstance.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# DomainInstance.py - Class implementing a PVC virtual machine in pvcd
+# VMInstance.py - Class implementing a PVC virtual machine in pvcd
 # Part of the Parallel Virtual Cluster (PVC) system
 #
 #    Copyright (C) 2018  Joshua M. Boniface <joshua@boniface.me>
@@ -32,9 +32,9 @@ import kazoo.client
 import pvcd.log as log
 import pvcd.zkhandler as zkhandler
 
-import pvcd.DomainConsoleWatcherInstance as DomainConsoleWatcherInstance
+import pvcd.VMConsoleWatcherInstance as VMConsoleWatcherInstance
 
-class DomainInstance(object):
+class VMInstance(object):
     # Initialization function
     def __init__(self, domuuid, zk_conn, config, logger, this_node):
         # Passed-in variables on creation
@@ -61,7 +61,7 @@ class DomainInstance(object):
         self.dom = self.lookupByUUID(self.domuuid)
 
         # Log watcher instance
-        self.console_log_instance = DomainConsoleWatcherInstance.DomainConsoleWatcherInstance(self.domuuid, self.domname, self.zk_conn, self.config, self.logger, self.this_node)
+        self.console_log_instance = VMConsoleWatcherInstance.VMConsoleWatcherInstance(self.domuuid, self.domname, self.zk_conn, self.config, self.logger, self.this_node)
 
         # Watch for changes to the state field in Zookeeper
         @self.zk_conn.DataWatch('/domains/{}/state'.format(self.domuuid))