diff --git a/release/scripts/io/engine_render_pov.py b/release/scripts/io/engine_render_pov.py
index 6e5edfb5e05..604d9053848 100644
--- a/release/scripts/io/engine_render_pov.py
+++ b/release/scripts/io/engine_render_pov.py
@@ -826,28 +826,28 @@ class PovrayRender(bpy.types.RenderEngine):
 bpy.types.register(PovrayRender)
 
 # Use some of the existing buttons.
-import buttons_render
-buttons_render.RENDER_PT_render.COMPAT_ENGINES.add('POVRAY_RENDER')
-buttons_render.RENDER_PT_dimensions.COMPAT_ENGINES.add('POVRAY_RENDER')
-buttons_render.RENDER_PT_antialiasing.COMPAT_ENGINES.add('POVRAY_RENDER')
-buttons_render.RENDER_PT_output.COMPAT_ENGINES.add('POVRAY_RENDER')
-del buttons_render
+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')
+properties_render.RENDER_PT_output.COMPAT_ENGINES.add('POVRAY_RENDER')
+del properties_render
 
 # Use only a subset of the world panels
-import buttons_world
-buttons_world.WORLD_PT_preview.COMPAT_ENGINES.add('POVRAY_RENDER')
-buttons_world.WORLD_PT_context_world.COMPAT_ENGINES.add('POVRAY_RENDER')
-buttons_world.WORLD_PT_world.COMPAT_ENGINES.add('POVRAY_RENDER')
-buttons_world.WORLD_PT_mist.COMPAT_ENGINES.add('POVRAY_RENDER')
-del buttons_world
+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')
+properties_world.WORLD_PT_mist.COMPAT_ENGINES.add('POVRAY_RENDER')
+del properties_world
 
 # Example of wrapping every class 'as is'
-import buttons_material
-for member in dir(buttons_material):
-	subclass = getattr(buttons_material, member)
+import properties_material
+for member in dir(properties_material):
+	subclass = getattr(properties_material, member)
 	try:		subclass.COMPAT_ENGINES.add('POVRAY_RENDER')
 	except:	pass
-del buttons_material
+del properties_material
 
 class RenderButtonsPanel(bpy.types.Panel):
 	bl_space_type = 'PROPERTIES'
diff --git a/release/scripts/ui/buttons_data_armature.py b/release/scripts/ui/properties_data_armature.py
similarity index 100%
rename from release/scripts/ui/buttons_data_armature.py
rename to release/scripts/ui/properties_data_armature.py
diff --git a/release/scripts/ui/buttons_data_bone.py b/release/scripts/ui/properties_data_bone.py
similarity index 100%
rename from release/scripts/ui/buttons_data_bone.py
rename to release/scripts/ui/properties_data_bone.py
diff --git a/release/scripts/ui/buttons_data_camera.py b/release/scripts/ui/properties_data_camera.py
similarity index 100%
rename from release/scripts/ui/buttons_data_camera.py
rename to release/scripts/ui/properties_data_camera.py
diff --git a/release/scripts/ui/buttons_data_curve.py b/release/scripts/ui/properties_data_curve.py
similarity index 100%
rename from release/scripts/ui/buttons_data_curve.py
rename to release/scripts/ui/properties_data_curve.py
diff --git a/release/scripts/ui/buttons_data_empty.py b/release/scripts/ui/properties_data_empty.py
similarity index 100%
rename from release/scripts/ui/buttons_data_empty.py
rename to release/scripts/ui/properties_data_empty.py
diff --git a/release/scripts/ui/buttons_data_lamp.py b/release/scripts/ui/properties_data_lamp.py
similarity index 100%
rename from release/scripts/ui/buttons_data_lamp.py
rename to release/scripts/ui/properties_data_lamp.py
diff --git a/release/scripts/ui/buttons_data_lattice.py b/release/scripts/ui/properties_data_lattice.py
similarity index 100%
rename from release/scripts/ui/buttons_data_lattice.py
rename to release/scripts/ui/properties_data_lattice.py
diff --git a/release/scripts/ui/buttons_data_mesh.py b/release/scripts/ui/properties_data_mesh.py
similarity index 100%
rename from release/scripts/ui/buttons_data_mesh.py
rename to release/scripts/ui/properties_data_mesh.py
diff --git a/release/scripts/ui/buttons_data_metaball.py b/release/scripts/ui/properties_data_metaball.py
similarity index 100%
rename from release/scripts/ui/buttons_data_metaball.py
rename to release/scripts/ui/properties_data_metaball.py
diff --git a/release/scripts/ui/buttons_data_modifier.py b/release/scripts/ui/properties_data_modifier.py
similarity index 100%
rename from release/scripts/ui/buttons_data_modifier.py
rename to release/scripts/ui/properties_data_modifier.py
diff --git a/release/scripts/ui/buttons_data_text.py b/release/scripts/ui/properties_data_text.py
similarity index 100%
rename from release/scripts/ui/buttons_data_text.py
rename to release/scripts/ui/properties_data_text.py
diff --git a/release/scripts/ui/buttons_game.py b/release/scripts/ui/properties_game.py
similarity index 100%
rename from release/scripts/ui/buttons_game.py
rename to release/scripts/ui/properties_game.py
diff --git a/release/scripts/ui/buttons_material.py b/release/scripts/ui/properties_material.py
similarity index 100%
rename from release/scripts/ui/buttons_material.py
rename to release/scripts/ui/properties_material.py
diff --git a/release/scripts/ui/buttons_object.py b/release/scripts/ui/properties_object.py
similarity index 100%
rename from release/scripts/ui/buttons_object.py
rename to release/scripts/ui/properties_object.py
diff --git a/release/scripts/ui/buttons_object_constraint.py b/release/scripts/ui/properties_object_constraint.py
similarity index 100%
rename from release/scripts/ui/buttons_object_constraint.py
rename to release/scripts/ui/properties_object_constraint.py
diff --git a/release/scripts/ui/buttons_particle.py b/release/scripts/ui/properties_particle.py
similarity index 99%
rename from release/scripts/ui/buttons_particle.py
rename to release/scripts/ui/properties_particle.py
index 7633787b69b..e23c8ddd70c 100644
--- a/release/scripts/ui/buttons_particle.py
+++ b/release/scripts/ui/properties_particle.py
@@ -1,10 +1,10 @@
 
 import bpy
 
-from buttons_physics_common import point_cache_ui
-from buttons_physics_common import effector_weights_ui
-from buttons_physics_common import basic_force_field_settings_ui
-from buttons_physics_common import basic_force_field_falloff_ui
+from properties_physics_common import point_cache_ui
+from properties_physics_common import effector_weights_ui
+from properties_physics_common import basic_force_field_settings_ui
+from properties_physics_common import basic_force_field_falloff_ui
 
 def particle_panel_enabled(context, psys):
     return psys.point_cache.baked==False and psys.edited==False and (not context.particle_system_editable)
diff --git a/release/scripts/ui/buttons_physics_cloth.py b/release/scripts/ui/properties_physics_cloth.py
similarity index 98%
rename from release/scripts/ui/buttons_physics_cloth.py
rename to release/scripts/ui/properties_physics_cloth.py
index 208f2ed75e3..f2d8842d103 100644
--- a/release/scripts/ui/buttons_physics_cloth.py
+++ b/release/scripts/ui/properties_physics_cloth.py
@@ -1,8 +1,8 @@
 
 import bpy
 
-from buttons_physics_common import point_cache_ui
-from buttons_physics_common import effector_weights_ui
+from properties_physics_common import point_cache_ui
+from properties_physics_common import effector_weights_ui
 
 def cloth_panel_enabled(md):
     return md.point_cache.baked==False
diff --git a/release/scripts/ui/buttons_physics_common.py b/release/scripts/ui/properties_physics_common.py
similarity index 100%
rename from release/scripts/ui/buttons_physics_common.py
rename to release/scripts/ui/properties_physics_common.py
diff --git a/release/scripts/ui/buttons_physics_field.py b/release/scripts/ui/properties_physics_field.py
similarity index 98%
rename from release/scripts/ui/buttons_physics_field.py
rename to release/scripts/ui/properties_physics_field.py
index 1f0518620d9..fd2dc43b09c 100644
--- a/release/scripts/ui/buttons_physics_field.py
+++ b/release/scripts/ui/properties_physics_field.py
@@ -1,8 +1,8 @@
 
 import bpy
 
-from buttons_physics_common import basic_force_field_settings_ui
-from buttons_physics_common import basic_force_field_falloff_ui
+from properties_physics_common import basic_force_field_settings_ui
+from properties_physics_common import basic_force_field_falloff_ui
 
 class PhysicButtonsPanel(bpy.types.Panel):
     bl_space_type = 'PROPERTIES'
diff --git a/release/scripts/ui/buttons_physics_fluid.py b/release/scripts/ui/properties_physics_fluid.py
similarity index 100%
rename from release/scripts/ui/buttons_physics_fluid.py
rename to release/scripts/ui/properties_physics_fluid.py
diff --git a/release/scripts/ui/buttons_physics_smoke.py b/release/scripts/ui/properties_physics_smoke.py
similarity index 98%
rename from release/scripts/ui/buttons_physics_smoke.py
rename to release/scripts/ui/properties_physics_smoke.py
index eaf32ccb0f3..77c1250fbb2 100644
--- a/release/scripts/ui/buttons_physics_smoke.py
+++ b/release/scripts/ui/properties_physics_smoke.py
@@ -1,8 +1,8 @@
 
 import bpy
 
-from buttons_physics_common import point_cache_ui
-from buttons_physics_common import effector_weights_ui
+from properties_physics_common import point_cache_ui
+from properties_physics_common import effector_weights_ui
 
 class PhysicButtonsPanel(bpy.types.Panel):
     bl_space_type = 'PROPERTIES'
diff --git a/release/scripts/ui/buttons_physics_softbody.py b/release/scripts/ui/properties_physics_softbody.py
similarity index 98%
rename from release/scripts/ui/buttons_physics_softbody.py
rename to release/scripts/ui/properties_physics_softbody.py
index a11c33b95b2..24183611d95 100644
--- a/release/scripts/ui/buttons_physics_softbody.py
+++ b/release/scripts/ui/properties_physics_softbody.py
@@ -1,8 +1,8 @@
 
 import bpy
 
-from buttons_physics_common import point_cache_ui
-from buttons_physics_common import effector_weights_ui
+from properties_physics_common import point_cache_ui
+from properties_physics_common import effector_weights_ui
 
 def softbody_panel_enabled(md):
     return md.point_cache.baked==False
diff --git a/release/scripts/ui/buttons_render.py b/release/scripts/ui/properties_render.py
similarity index 100%
rename from release/scripts/ui/buttons_render.py
rename to release/scripts/ui/properties_render.py
diff --git a/release/scripts/ui/buttons_scene.py b/release/scripts/ui/properties_scene.py
similarity index 100%
rename from release/scripts/ui/buttons_scene.py
rename to release/scripts/ui/properties_scene.py
diff --git a/release/scripts/ui/buttons_texture.py b/release/scripts/ui/properties_texture.py
similarity index 100%
rename from release/scripts/ui/buttons_texture.py
rename to release/scripts/ui/properties_texture.py
diff --git a/release/scripts/ui/buttons_world.py b/release/scripts/ui/properties_world.py
similarity index 100%
rename from release/scripts/ui/buttons_world.py
rename to release/scripts/ui/properties_world.py