diff --git a/xos/core/api/slivers.py b/xos/core/api/instances.py
similarity index 100%
rename from xos/core/api/slivers.py
rename to xos/core/api/instances.py
diff --git a/xos/core/models/sliver.py b/xos/core/models/instance.py
similarity index 100%
rename from xos/core/models/sliver.py
rename to xos/core/models/instance.py
diff --git a/xos/core/views/slivers.py b/xos/core/views/instances.py
similarity index 100%
rename from xos/core/views/slivers.py
rename to xos/core/views/instances.py
diff --git a/xos/ec2_observer/deleters/sliver_deleter.py b/xos/ec2_observer/deleters/instance_deleter.py
similarity index 100%
rename from xos/ec2_observer/deleters/sliver_deleter.py
rename to xos/ec2_observer/deleters/instance_deleter.py
diff --git a/xos/ec2_observer/deleters/network_sliver_deleter.py b/xos/ec2_observer/deleters/network_instance_deleter.py
similarity index 100%
rename from xos/ec2_observer/deleters/network_sliver_deleter.py
rename to xos/ec2_observer/deleters/network_instance_deleter.py
diff --git a/xos/ec2_observer/steps/sync_slivers.py b/xos/ec2_observer/steps/sync_instances.py
similarity index 100%
rename from xos/ec2_observer/steps/sync_slivers.py
rename to xos/ec2_observer/steps/sync_instances.py
diff --git a/xos/importer/plclassic/sliver_importer.py b/xos/importer/plclassic/instance_importer.py
similarity index 100%
rename from xos/importer/plclassic/sliver_importer.py
rename to xos/importer/plclassic/instance_importer.py
diff --git a/xos/openstack/sliveragent.py b/xos/openstack/instanceagent.py
similarity index 100%
rename from xos/openstack/sliveragent.py
rename to xos/openstack/instanceagent.py
diff --git a/xos/openstack_observer/steps/sync_slivers.py b/xos/openstack_observer/steps/sync_instances.py
similarity index 100%
rename from xos/openstack_observer/steps/sync_slivers.py
rename to xos/openstack_observer/steps/sync_instances.py
diff --git a/xos/openstack_observer/steps/sync_network_slivers.py b/xos/openstack_observer/steps/sync_network_instances.py
similarity index 100%
rename from xos/openstack_observer/steps/sync_network_slivers.py
rename to xos/openstack_observer/steps/sync_network_instances.py
diff --git a/xos/tests/slivertest.py b/xos/tests/instancetest.py
similarity index 100%
rename from xos/tests/slivertest.py
rename to xos/tests/instancetest.py