diff --git a/render_copy_settings/__init__.py b/render_copy_settings/__init__.py
index d891552ac727fea14de9b3d9a21b46bbbfd43ea7..abd012998cce1eef25035599006974d97076cc68 100644
--- a/render_copy_settings/__init__.py
+++ b/render_copy_settings/__init__.py
@@ -71,7 +71,7 @@ class RenderCopySettingsDataSetting(bpy.types.PropertyGroup):
 class RenderCopySettingsData(bpy.types.PropertyGroup):
     # XXX: The consistency of this collection is delegated to the UI code.
     #      It should only contain one element for each render setting.
-    affected_settings = CollectionProperty(type=RenderCopySettingsSetting,
+    affected_settings = CollectionProperty(type=RenderCopySettingsDataSetting,
                                            name="Affected Settings",
                                            description="The list of all available render settings")
     # XXX Unused, but needed for template_list…
@@ -79,7 +79,7 @@ class RenderCopySettingsData(bpy.types.PropertyGroup):
 
     # XXX: The consistency of this collection is delegated to the UI code.
     #      It should only contain one element for each scene.
-    allowed_scenes = CollectionProperty(type=RenderCopySettingsScene,
+    allowed_scenes = CollectionProperty(type=RenderCopySettingsDataScene,
                                         name="Allowed Scenes",
                                         description="The list all scenes in the file")
     # XXX Unused, but needed for template_list…
@@ -100,7 +100,7 @@ classes = (
 def register():
     for cls in classes:
         bpy.utils.register_class(cls)
-    bpy.types.Scene.render_copy_settings = PointerProperty(type=RenderCopySettings)
+    bpy.types.Scene.render_copy_settings = PointerProperty(type=RenderCopySettingsData)
 
     bpy.app.translations.register(__name__, translations.translations_dict)
 
diff --git a/render_copy_settings/panel.py b/render_copy_settings/panel.py
index 6b182c1e8d58ff5e6472461e6af787c05ddb5295..db609a15d6d230c65a840d3ea0d59b9c4734796b 100644
--- a/render_copy_settings/panel.py
+++ b/render_copy_settings/panel.py
@@ -24,19 +24,19 @@ from . import presets
 
 class RENDER_UL_copy_settings(bpy.types.UIList):
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
-        #assert(isinstance(item, (bpy.types.RenderCopySettingsScene, bpy.types.RenderCopySettingsSetting)))
+        #assert(isinstance(item, (bpy.types.RenderCopySettingsScene, bpy.types.RenderCopySettingsDataSetting)))
         if self.layout_type in {'DEFAULT', 'COMPACT'}:
-            if isinstance(item, bpy.types.RenderCopySettingsSetting):
+            if isinstance(item, bpy.types.RenderCopySettingsDataSetting):
                 layout.label(item.name, icon_value=icon)
                 layout.prop(item, "copy", text="")
-            else: #elif isinstance(item, bpy.types.RenderCopySettingsScene):
+            else: #elif isinstance(item, bpy.types.RenderCopySettingsDataScene):
                 layout.prop(item, "allowed", text=item.name, toggle=True)
         elif self.layout_type in {'GRID'}:
             layout.alignment = 'CENTER'
-            if isinstance(item, bpy.types.RenderCopySettingsSetting):
+            if isinstance(item, bpy.types.RenderCopySettingsDataSetting):
                 layout.label(item.name, icon_value=icon)
                 layout.prop(item, "copy", text="")
-            else: #elif isinstance(item, bpy.types.RenderCopySettingsScene):
+            else: #elif isinstance(item, bpy.types.RenderCopySettingsDataScene):
                 layout.prop(item, "allowed", text=item.name, toggle=True)