diff --git a/add_curve_aceous_galore.py b/add_curve_aceous_galore.py
index bf52e4738f02983955cb90c270505106bd12c193..be8bbc6e0545a0ea60efce23c8e4619e9d00a6d8 100644
--- a/add_curve_aceous_galore.py
+++ b/add_curve_aceous_galore.py
@@ -22,8 +22,8 @@ bl_info = {
     'version': (0,2),
     'blender': (2, 5, 3),
     'api': 32411,
-    'location': 'Add Curve menu',
-    'description': 'adds many types of curves',
+    'location': 'View3D > Add > Curve',
+    'description': 'Adds many different types of Curves',
     'warning': '', # used for warning icon and text in addons panel
     'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/' \
         'Scripts/Curve/Curves_Galore',
diff --git a/add_mesh_3d_function_surface.py b/add_mesh_3d_function_surface.py
index 6149232e66aae58ea3937d95eb9052436a9fb574..322ae7073ebe49f9ae313f29c5457cfdd2bec3e5 100644
--- a/add_mesh_3d_function_surface.py
+++ b/add_mesh_3d_function_surface.py
@@ -22,8 +22,7 @@ bl_info = {
     "version": (0, 3, 7),
     "blender": (2, 5, 6),
     "api": 34093,
-    "location": "View3D > Add > Mesh >"\
-        " Z Function Surface & XYZ Function Surface",
+    "location": "View3D > Add > Mesh",
     "description": "Create Objects using Math Formulas",
     "warning": "",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\
diff --git a/add_mesh_BoltFactory/__init__.py b/add_mesh_BoltFactory/__init__.py
index 1c22f574235b934295ac48adabf7fbdcfa018dd2..256c4f8104b8f3e0bb2b642e5d21b2b4201aed7d 100644
--- a/add_mesh_BoltFactory/__init__.py
+++ b/add_mesh_BoltFactory/__init__.py
@@ -22,7 +22,8 @@ bl_info = {
     "version": (3,9),
     "blender": (2, 5, 3),
     "api": 32411,
-    "location": "add Mesh",
+    "location": "View3D > Add > Mesh",
+    "description": "Adds a Bolt or Nut",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\
         "Scripts/Add_Mesh/BoltFactory",
     "tracker_url": "https://projects.blender.org/tracker/index.php?"\
diff --git a/add_mesh_ant_landscape.py b/add_mesh_ant_landscape.py
index 977e52135fd5fc98ee07b400f437f853c2c70f03..f0a38b328d63a28ad3762a9b787211bbcf1f2382 100644
--- a/add_mesh_ant_landscape.py
+++ b/add_mesh_ant_landscape.py
@@ -22,8 +22,8 @@ bl_info = {
     "version": (0,1,1),
     "blender": (2, 5, 6),
     "api": 32411,
-    "location": "Add Mesh menu",
-    "description": "Adds a landscape primitive",
+    "location": "View3D > Add > Mesh",
+    "description": "Adds a Landscape Primitive",
     "warning": "", # used for warning icon and text in addons panel
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\
         "Scripts/Add_Mesh/ANT_Landscape",
diff --git a/animation_animall.py b/animation_animall.py
index fe970bc45c71e828f4967718e7e3ae6877ab64ae..ae6e885c381cebc1502e6f261ccb74f1c1963a4d 100644
--- a/animation_animall.py
+++ b/animation_animall.py
@@ -22,7 +22,7 @@ bl_info = {
     'version': (0, 4),
     'blender': (2, 5, 5),
     'api': 34513,
-    'location': 'Select a Mesh: Toolbar > AnimAll panel',
+    'location': 'Select a Mesh: Tool Shelf > AnimAll panel',
     'description': 'Allows animation of mesh and lattice data (Shape Keys, VCols, VGroups, UVs)',
     'warning': '',
     'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/Animation/AnimAll',
diff --git a/animation_rotobezier.py b/animation_rotobezier.py
index fcc9b7172124eb2851fca1b1b7d7a57324ac7d26..9dccfaec086fbf6d968588959ea7f7a69f027c50 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: Toolbar > 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/curve_simplify.py b/curve_simplify.py
index 280b7120c15be87a8df79f0b6ca4aee2a6a11e09..8b1fc0ade5bf4ea09483cb77f2031863a994669d 100644
--- a/curve_simplify.py
+++ b/curve_simplify.py
@@ -22,8 +22,8 @@ bl_info = {
     "version": (1,),
     "blender": (2, 5, 3),
     "api": 32411,
-    "location": "Toolshelf > search > simplify curves",
-    "description": "This script simplifies 3D curves and fcurves",
+    "location": "Search > Simplify Curves",
+    "description": "Simplifies 3D curves and fcurves",
     "warning": "",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\
         "Scripts/Curve/Curve_Simplify",
diff --git a/object_fracture/__init__.py b/object_fracture/__init__.py
index 824f5b51f53891898d58d1ea40a11d8c61c28951..b678724bc5f04b4a6a1a09f7a547f3c96387f4c7 100644
--- a/object_fracture/__init__.py
+++ b/object_fracture/__init__.py
@@ -22,7 +22,7 @@ bl_info = {
     "version": (2,0),
     "blender": (2, 5, 3),
     "api": 31965,
-    "location": "Fracture tools (Search > Fracture Object & Add -> Fracture Helper Objects",
+    "location": "Search > Fracture Object & Add -> Fracture Helper Objects",
     "description": "Fractured Object, Bomb, Projectile, Recorder",
     "warning": "",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\
diff --git a/render_povray/__init__.py b/render_povray/__init__.py
index 1eae506f327a7ca7af2c09380fe52371882b1296..65d8a04b13f3db0c84ca8cc3a6a6a3686a9cf62e 100644
--- a/render_povray/__init__.py
+++ b/render_povray/__init__.py
@@ -24,7 +24,7 @@ bl_info = {
     "version": (0, 0, 7),
     "blender": (2, 5, 6),
     "api": 34318,
-    "location": "Info Header (engine dropdown)",
+    "location": "Render > Engine > POV-Ray 3.7",
     "description": "Basic POV-Ray 3.7 integration for blender",
     "warning": "both POV-Ray 3.7 and this script are beta",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\
diff --git a/rigify/__init__.py b/rigify/__init__.py
index f1dcabe338b14827dbfee6c70997cbfd34b4704f..20821f9d3c94881fb2e045d88a8c3b1368e440fc 100644
--- a/rigify/__init__.py
+++ b/rigify/__init__.py
@@ -21,7 +21,8 @@ bl_info = {
     "author": "Nathan Vegdahl",
     "version": (0, 5),
     "blender": (2, 5, 5),
-    "description": "?",
+    "location": "View3D > Add > Armature",
+    "description": "Adds various Rig Templates",
     "api": 33110,
     "location": "Armature properties",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\