diff --git a/render_povray/ui.py b/render_povray/ui.py
index 7619d2b255fbf6a3b933fd2b2842eb79d91d1053..233cc601f9feb2cf0889bc33c5c89b86e42bd73c 100644
--- a/render_povray/ui.py
+++ b/render_povray/ui.py
@@ -22,7 +22,7 @@ import bpy
 from bpy.props import EnumProperty
 
 # Use some of the existing buttons.
-import properties_render
+from bl_ui import properties_render
 properties_render.RENDER_PT_render.COMPAT_ENGINES.add('POVRAY_RENDER')
 properties_render.RENDER_PT_dimensions.COMPAT_ENGINES.add('POVRAY_RENDER')
 # properties_render.RENDER_PT_antialiasing.COMPAT_ENGINES.add('POVRAY_RENDER')
@@ -31,7 +31,7 @@ properties_render.RENDER_PT_output.COMPAT_ENGINES.add('POVRAY_RENDER')
 del properties_render
 
 # Use only a subset of the world panels
-import properties_world
+from bl_ui import properties_world
 properties_world.WORLD_PT_preview.COMPAT_ENGINES.add('POVRAY_RENDER')
 properties_world.WORLD_PT_context_world.COMPAT_ENGINES.add('POVRAY_RENDER')
 properties_world.WORLD_PT_world.COMPAT_ENGINES.add('POVRAY_RENDER')
@@ -39,7 +39,7 @@ properties_world.WORLD_PT_mist.COMPAT_ENGINES.add('POVRAY_RENDER')
 del properties_world
 
 # Example of wrapping every class 'as is'
-import properties_material
+from bl_ui import properties_material
 for member in dir(properties_material):
     subclass = getattr(properties_material, member)
     try:
@@ -48,7 +48,7 @@ for member in dir(properties_material):
         pass
 del properties_material
 
-import properties_data_mesh
+from bl_ui import properties_data_mesh
 for member in dir(properties_data_mesh):
     subclass = getattr(properties_data_mesh, member)
     try:
@@ -57,7 +57,7 @@ for member in dir(properties_data_mesh):
         pass
 del properties_data_mesh
 
-import properties_texture
+from bl_ui import properties_texture
 for member in dir(properties_texture):
     subclass = getattr(properties_texture, member)
     try:
@@ -66,7 +66,7 @@ for member in dir(properties_texture):
         pass
 del properties_texture
 
-import properties_data_camera
+from bl_ui import properties_data_camera
 for member in dir(properties_data_camera):
     subclass = getattr(properties_data_camera, member)
     try:
@@ -75,7 +75,7 @@ for member in dir(properties_data_camera):
         pass
 del properties_data_camera
 
-import properties_data_lamp
+from bl_ui import properties_data_lamp
 for member in dir(properties_data_lamp):
     subclass = getattr(properties_data_lamp, member)
     try:
diff --git a/render_renderfarmfi.py b/render_renderfarmfi.py
index d15bd6f7a5527d47f81f750b76d9c82ed2153a5d..e140f6c07acdb43c029f7952210313aaee850a94 100644
--- a/render_renderfarmfi.py
+++ b/render_renderfarmfi.py
@@ -115,28 +115,28 @@ class ORESettings(bpy.types.PropertyGroup):
 
 # all panels, except render panel
 # Example of wrapping every class 'as is'
-import properties_scene
+from bl_ui import properties_scene
 for member in dir(properties_scene):
     subclass = getattr(properties_scene, member)
     try:        subclass.COMPAT_ENGINES.add('RENDERFARMFI_RENDER')
     except:    pass
 del properties_scene
 
-import properties_world
+from bl_ui import properties_world
 for member in dir(properties_world):
     subclass = getattr(properties_world, member)
     try:        subclass.COMPAT_ENGINES.add('RENDERFARMFI_RENDER')
     except:    pass
 del properties_world
 
-import properties_material
+from bl_ui import properties_material
 for member in dir(properties_material):
     subclass = getattr(properties_material, member)
     try:        subclass.COMPAT_ENGINES.add('RENDERFARMFI_RENDER')
     except:    pass
 del properties_material
 
-import properties_object
+from bl_ui import properties_object
 for member in dir(properties_object):
     subclass = getattr(properties_object, member)
     try:        subclass.COMPAT_ENGINES.add('RENDERFARMFI_RENDER')