diff --git a/admin/assets/css/language_translation.css b/admin/assets/css/language_translation.css
index e1416698b..8810a3e85 100644
--- a/admin/assets/css/language_translation.css
+++ b/admin/assets/css/language_translation.css
@@ -9,7 +9,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/assets/css/language_translations.css b/admin/assets/css/language_translations.css
index f1dddd4cd..851949bcb 100644
--- a/admin/assets/css/language_translations.css
+++ b/admin/assets/css/language_translations.css
@@ -9,7 +9,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/controllers/language_translation.php b/admin/controllers/language_translation.php
index f99fdf3bd..f4b1c9e7e 100644
--- a/admin/controllers/language_translation.php
+++ b/admin/controllers/language_translation.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/controllers/language_translations.php b/admin/controllers/language_translations.php
index 36e350624..af6d29edc 100644
--- a/admin/controllers/language_translations.php
+++ b/admin/controllers/language_translations.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/models/forms/language_translation.js b/admin/models/forms/language_translation.js
index fea929045..72000456f 100644
--- a/admin/models/forms/language_translation.js
+++ b/admin/models/forms/language_translation.js
@@ -9,7 +9,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/models/language_translation.php b/admin/models/language_translation.php
index b25b0a874..3f36ca357 100644
--- a/admin/models/language_translation.php
+++ b/admin/models/language_translation.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
@@ -116,15 +116,15 @@ class ComponentbuilderModelLanguage_translation extends JModelAdmin
 				$id = $item->id;
 			}			
 			// set the id and view name to session
-			if ($vdm = ComponentbuilderHelper::get('language_placeholder__'.$id))
+			if ($vdm = ComponentbuilderHelper::get('language_translation__'.$id))
 			{
 				$this->vastDevMod = $vdm;
 			}
 			else
 			{
 				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
-				ComponentbuilderHelper::set($this->vastDevMod, 'language_placeholder__'.$id);
-				ComponentbuilderHelper::set('language_placeholder__'.$id, $this->vastDevMod);
+				ComponentbuilderHelper::set($this->vastDevMod, 'language_translation__'.$id);
+				ComponentbuilderHelper::set('language_translation__'.$id, $this->vastDevMod);
 			}			
 			
 			if (!empty($item->id))
diff --git a/admin/models/language_translations.php b/admin/models/language_translations.php
index f00fc1637..13a55e38b 100644
--- a/admin/models/language_translations.php
+++ b/admin/models/language_translations.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/tables/language_translation.php b/admin/tables/language_translation.php
index 9ae9eb872..8eda17ee4 100644
--- a/admin/tables/language_translation.php
+++ b/admin/tables/language_translation.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translation/submitbutton.js b/admin/views/language_translation/submitbutton.js
index fb6e373c1..420fa1a6a 100644
--- a/admin/views/language_translation/submitbutton.js
+++ b/admin/views/language_translation/submitbutton.js
@@ -9,7 +9,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translation/tmpl/edit.php b/admin/views/language_translation/tmpl/edit.php
index 354b106b1..b7f996f2a 100644
--- a/admin/views/language_translation/tmpl/edit.php
+++ b/admin/views/language_translation/tmpl/edit.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translation/view.html.php b/admin/views/language_translation/view.html.php
index e136b5a0a..b81265987 100644
--- a/admin/views/language_translation/view.html.php
+++ b/admin/views/language_translation/view.html.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translations/tmpl/default.php b/admin/views/language_translations/tmpl/default.php
index ff13490dc..11654e1ee 100644
--- a/admin/views/language_translations/tmpl/default.php
+++ b/admin/views/language_translations/tmpl/default.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translations/tmpl/default_batch_body.php b/admin/views/language_translations/tmpl/default_batch_body.php
index 343c8bd80..0ac8e9de9 100644
--- a/admin/views/language_translations/tmpl/default_batch_body.php
+++ b/admin/views/language_translations/tmpl/default_batch_body.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translations/tmpl/default_batch_footer.php b/admin/views/language_translations/tmpl/default_batch_footer.php
index 5860b59b3..66270d853 100644
--- a/admin/views/language_translations/tmpl/default_batch_footer.php
+++ b/admin/views/language_translations/tmpl/default_batch_footer.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translations/tmpl/default_body.php b/admin/views/language_translations/tmpl/default_body.php
index 671ffb264..c5524c8ce 100644
--- a/admin/views/language_translations/tmpl/default_body.php
+++ b/admin/views/language_translations/tmpl/default_body.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translations/tmpl/default_foot.php b/admin/views/language_translations/tmpl/default_foot.php
index 12f0d061a..3dab182cd 100644
--- a/admin/views/language_translations/tmpl/default_foot.php
+++ b/admin/views/language_translations/tmpl/default_foot.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translations/tmpl/default_head.php b/admin/views/language_translations/tmpl/default_head.php
index a6f3f780c..a93413dc1 100644
--- a/admin/views/language_translations/tmpl/default_head.php
+++ b/admin/views/language_translations/tmpl/default_head.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translations/tmpl/default_toolbar.php b/admin/views/language_translations/tmpl/default_toolbar.php
index 3bd5c1f6f..eadd766f8 100644
--- a/admin/views/language_translations/tmpl/default_toolbar.php
+++ b/admin/views/language_translations/tmpl/default_toolbar.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
diff --git a/admin/views/language_translations/view.html.php b/admin/views/language_translations/view.html.php
index a5cdc5b07..4db81f07a 100644
--- a/admin/views/language_translations/view.html.php
+++ b/admin/views/language_translations/view.html.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 35 of this MVC
+	@version		@update number 37 of this MVC
 	@build			5th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder