diff --git a/animation_rotobezier.py b/animation_rotobezier.py
index 9dccfaec086fbf6d968588959ea7f7a69f027c50..d7d44c05bdda761fc954cf2d1aec889349ae47ea 100644
--- a/animation_rotobezier.py
+++ b/animation_rotobezier.py
@@ -22,7 +22,7 @@ bl_info = {
     'version': (0, 8),
     'blender': (2, 5, 5),
     'api': 33232,
-    'location': 'Select a Curve: Tool Shelf > RotoBezier panel',
+    'location': 'Select a Curve: Tool Shelf > RotoBezier Panel',
     'description': 'Allows animation of Bezier and NURBS curves',
     'warning': '',
     'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/'\
diff --git a/mesh_surface_sketch.py b/mesh_surface_sketch.py
index e6e90cd08cda53de1c74e9a5e542bd942027919e..df6f9f7fe17a1892ba05894e5e4f9461ae81b7a4 100644
--- a/mesh_surface_sketch.py
+++ b/mesh_surface_sketch.py
@@ -22,7 +22,7 @@ bl_info = {
     "version": (0,8),
     "blender": (2, 5, 3),
     "api": 31847,
-    "location": "View3D > EditMode > ToolShelf",
+    "location": "View3D > EditMode > Tool Shelf > Surface Sketching Panel",
     "description": "Draw meshes and re-topologies with Grease Pencil",
     "warning": "Beta",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\
diff --git a/object_add_chain.py b/object_add_chain.py
index a6c5e4495f3c5cc3241f7fe14e0c6e4aef507173..bd6696e48298974f1b19c96831cfa6def3b2b0d5 100644
--- a/object_add_chain.py
+++ b/object_add_chain.py
@@ -22,7 +22,7 @@ bl_info = {
     "version": (0,1),
     "blender": (2, 5, 3),
     "api": 31965,
-    "location": "View3D > Add > Mesh > Chain",
+    "location": "View3D > Add > Mesh",
     "description": "Adds Chain with curve guide for easy creation",
     "warning": "",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\
diff --git a/object_animrenderbake.py b/object_animrenderbake.py
index 6a7e223ef8548c3a37214d4214b4cb6b81e52ae2..05eb587778a48f68a8c2de749f3e57dac3cca01e 100644
--- a/object_animrenderbake.py
+++ b/object_animrenderbake.py
@@ -21,7 +21,7 @@ bl_info = {
     "author": "Janne Karhu (jahka)",
     "version": (1, 0),
     "blender": (2, 5, 5),
-    "location": "Render Properties > Bake",
+    "location": "Properties > Render > Bake Panel",
     "description": "Renderbakes a series of frames",
     "category": "Object",
     'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
diff --git a/object_cloud_gen.py b/object_cloud_gen.py
index 554f51800f096ac715d611a90f68b4c1388b4761..2ff1452268f23252a140fbb625aac5e907f212df 100644
--- a/object_cloud_gen.py
+++ b/object_cloud_gen.py
@@ -22,7 +22,7 @@ bl_info = {
     "version": (1,0),
     "blender": (2, 5, 5),
     "api": 31965,
-    "location": "Tool Shelf ",
+    "location": "View3D > Tool Shelf > Cloud Generator Panel",
     "description": "Creates Volumetric Clouds",
     "warning": "",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\
diff --git a/space_view3d_3d_navigation.py b/space_view3d_3d_navigation.py
index dd67e69159a46dba5f404f9bb6149a57f4dff1f9..ea8347e54a1ba4aec508ffd24af29555a551b823 100644
--- a/space_view3d_3d_navigation.py
+++ b/space_view3d_3d_navigation.py
@@ -27,7 +27,7 @@ bl_info = {
     "version": (1, 2),
     "blender": (2, 5, 4),
     "api": 32411,
-    "location": "View3D > Tool Shelf",
+    "location": "View3D > Tool Shelf > 3D Nav",
     "description": "Navigate the Camera & 3D View from the Toolshelf",
     "warning": "",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\
@@ -43,7 +43,7 @@ import bpy
 class VIEW3D_PT_3dnavigationPanel(bpy.types.Panel):
     bl_space_type = "VIEW_3D"
     bl_region_type = "TOOLS"
-    bl_label = "3D Views "
+    bl_label = "3D Nav"
 
     def draw(self, context):
         layout = self.layout
diff --git a/space_view3d_math_vis/__init__.py b/space_view3d_math_vis/__init__.py
index e4c8e15cebdc2fbdca4a221c4fb4f5333cf6399c..544454b889763645333a1000287ebd0e3de43a53 100644
--- a/space_view3d_math_vis/__init__.py
+++ b/space_view3d_math_vis/__init__.py
@@ -22,7 +22,7 @@ bl_info = {
     "version": (0, 1),
     "blender": (2, 5, 6),
     "api": 33110,
-    "location": "3D View Toolbar, Python Console",
+    "location": "View3D > Tool Shelf or Console",
     "description": "Display console defined mathutils variables in the 3D view",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\
         "Scripts/3D_interaction/Math_Viz",
diff --git a/space_view3d_panel_measure.py b/space_view3d_panel_measure.py
index 0d4501c8985cb3e94a52be45cde7e6ff33e10aa0..e137840ff0f1022059cce226724fb8a3a66c6ce0 100644
--- a/space_view3d_panel_measure.py
+++ b/space_view3d_panel_measure.py
@@ -22,7 +22,7 @@ bl_info = {
     "version": (0, 7, 12),
     "blender": (2, 5, 5),
     "api": 33931,
-    "location": "View3D > Properties > Measure",
+    "location": "View3D > Properties > Measure Panel",
     "description": "Measure distances between objects",
     "warning": "",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/" \
diff --git a/system_blend_info.py b/system_blend_info.py
index 55dbe5089e4802c2a2c7bc9d10c3e666e149fe38..a1885ec1bc54f265c60dd4e17cb0b41d7f2ab74d 100644
--- a/system_blend_info.py
+++ b/system_blend_info.py
@@ -26,7 +26,7 @@ bl_info = {
     "version": (0,3),
     "blender": (2, 5, 3),
     "api": 32411,
-    "location": "Properties space > Scene tab > Blend Info panel",
+    "location": "Properties > Scene > Blend Info Panel",
     "description": "Show information about the .blend",
     "warning": "",
     "wiki_url": 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
diff --git a/text_editor_api_navigator.py b/text_editor_api_navigator.py
index 87e1bc8555bf6f644e486e001d1410aab8482d64..8cf8bfd500eb580518172c7d47f3ad8fe2c93bd7 100644
--- a/text_editor_api_navigator.py
+++ b/text_editor_api_navigator.py
@@ -25,7 +25,7 @@ bl_info = {
     "version": (1, 0),
     "blender": (2, 5, 5),
     "api": 32760,
-    "location": "Text Editor -> Properties (CTRL+F) -> API Navigator Panel",
+    "location": "Text Editor > Properties > API Navigator Panel",
     "description": "Allows to explore the python api via the user interface",
     "warning": "",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"