diff --git a/dev/Knoin/AbstractViews.js b/dev/Knoin/AbstractViews.js
index 6a18194b6..5ddff917c 100644
--- a/dev/Knoin/AbstractViews.js
+++ b/dev/Knoin/AbstractViews.js
@@ -8,8 +8,8 @@ import { ViewType } from 'Knoin/Knoin';
 class AbstractView {
 	constructor(templateID, type)
 	{
-//		Object.defineProperty(this, 'templateId', { value: templateID });
-		this.templateId = templateID;
+//		Object.defineProperty(this, 'viewModelTemplateID', { value: templateID });
+		this.viewModelTemplateID = templateID;
 		this.viewType = type;
 		this.viewModelDom = null;
 
diff --git a/dev/Knoin/Knoin.js b/dev/Knoin/Knoin.js
index a7ab6090d..49f9ebb5b 100644
--- a/dev/Knoin/Knoin.js
+++ b/dev/Knoin/Knoin.js
@@ -36,7 +36,7 @@ const SCREENS = {},
 			ViewModelClass.__vm = vm;
 
 			if (vmPlace) {
-				vmDom = Element.fromHTML('<div class="rl-view-model RL-' + vm.templateId + '" hidden=""></div>');
+				vmDom = Element.fromHTML('<div class="rl-view-model RL-' + vm.viewModelTemplateID + '" hidden=""></div>');
 				vmPlace.append(vmDom);
 
 				vm.viewModelDom = vmDom;
@@ -92,7 +92,7 @@ const SCREENS = {},
 					vmDom,
 					{
 						i18nInit: true,
-						template: () => ({ name: vm.templateId })
+						template: () => ({ name: vm.viewModelTemplateID })
 					},
 					vm
 				);
diff --git a/plugins/login-register/LoginRegister.js b/plugins/login-register/LoginRegister.js
index 812bc449c..939095ce3 100644
--- a/plugins/login-register/LoginRegister.js
+++ b/plugins/login-register/LoginRegister.js
@@ -7,7 +7,7 @@
 
 		if (forgotUrl || registerUrl) {
 			addEventListener('rl-view-model', e => {
-				if (e.detail && 'Login' === (e.detail.templateId || e.detail.viewModelTemplateID)) {
+				if (e.detail && 'Login' === e.detail.viewModelTemplateID) {
 					const container = e.detail.viewModelDom.querySelector('#plugin-Login-BottomControlGroup'),
 						forgot = 'LOGIN/LABEL_FORGOT_PASSWORD',
 						register = 'LOGIN/LABEL_REGISTRATION';
diff --git a/plugins/two-factor-auth/js/TwoFactorAuthLogin.js b/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
index 17f1c25aa..c62522371 100644
--- a/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
+++ b/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
@@ -2,7 +2,7 @@
 (rl => {
 
 	rl && addEventListener('rl-view-model', e => {
-		if (e.detail && 'Login' === (e.detail.templateId || e.detail.viewModelTemplateID)) {
+		if (e.detail && 'Login' === e.detail.viewModelTemplateID) {
 			const container = e.detail.viewModelDom.querySelector('#plugin-Login-BottomControlGroup'),
 				placeholder = 'LOGIN/LABEL_TWO_FACTOR_CODE';
 			if (container) {