diff --git a/e107_core/shortcodes/batch/usersettings_shortcodes.php b/e107_core/shortcodes/batch/usersettings_shortcodes.php
index cf86f91f5..e0b6bbd67 100755
--- a/e107_core/shortcodes/batch/usersettings_shortcodes.php
+++ b/e107_core/shortcodes/batch/usersettings_shortcodes.php
@@ -387,7 +387,7 @@ class usersettings_shortcodes extends e_shortcode
 		
 		foreach($catList as $cat)
 		{
-			e107::setRegistry("extendedcat_{$cat['user_extended_struct_id']}", $cat);
+			e107::setRegistry("core/shortcodes/usersettings/userextended/cat_".$cat['user_extended_struct_id'], $cat);
 			$text = $this->sc_userextended_cat($cat['user_extended_struct_id']);
 			$ret .= $text;
 			$catName = vartrue($cat['user_extended_struct_text'], $cat['user_extended_struct_name']);
@@ -432,7 +432,7 @@ class usersettings_shortcodes extends e_shortcode
 		}
 
 		$ret = "";
-		$catInfo = e107::getRegistry("extendedcat_{$parm}");
+		$catInfo = e107::getRegistry("core/shortcodes/usersettings/userextended/cat_{$parm}");
 		if(!$catInfo)
 		{
 			$qry = "
@@ -464,7 +464,7 @@ class usersettings_shortcodes extends e_shortcode
 				$fieldList = $sql->db_getList();
 				foreach($fieldList as $field)
 				{
-					e107::setRegistry("extendedfield_{$field['user_extended_struct_name']}", $field);
+					e107::setRegistry("core/shortcodes/usersettings/userextended/{$field['user_extended_struct_name']}", $field);
 					$ret .= $this->sc_userextended_field($field['user_extended_struct_name']);
 				}
 			}
diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index 6a8ce80ed..0e2f93530 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -3471,7 +3471,9 @@ class e107
 			self::includeLan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_admin.php');
 		}
 
-		$cstring  = 'corelan/'.e_LANGUAGE.'_'.$fname.($admin ? '_admin' : '_front');
+		$cstring  = 'core/e107/corelan/'.e_LANGUAGE.'_'.$fname.($admin ? '_admin' : '_front');
+
+
 		if(self::getRegistry($cstring))
 		{
 			return null;
@@ -3522,7 +3524,9 @@ class e107
 	 */
 	public static function plugLan($plugin, $fname = '', $flat = false)
 	{
-		$cstring  = 'pluglan/'.e_LANGUAGE.'_'.$plugin.'_'.$fname.($flat ? '_1' : '_0');
+	//	$cstring  = 'pluglan/'.e_LANGUAGE.'_'.$plugin.'_'.$fname.($flat ? '_1' : '_0');
+		$cstring  = 'core/e107/pluglan/'.$plugin.'/'.e_LANGUAGE.'/'.$fname.($flat ? '_1' : '_0');
+
 		if(self::getRegistry($cstring))
 		{
 			return null;
diff --git a/e107_tests/tests/unit/e107_user_extendedTest.php b/e107_tests/tests/unit/e107_user_extendedTest.php
index c9b531254..99d91c06f 100644
--- a/e107_tests/tests/unit/e107_user_extendedTest.php
+++ b/e107_tests/tests/unit/e107_user_extendedTest.php
@@ -720,7 +720,11 @@
 			);
 
 			$result = $this->ue->getFieldNames();
-			$this->assertSame($expected, $result);
+
+			foreach($expected as $field)
+			{
+				$this->assertContains($field, $result);
+			}
 
 		}
 /*