diff --git a/application/applicationextension.inc.php b/application/applicationextension.inc.php
index d0f577af68..f595a34468 100644
--- a/application/applicationextension.inc.php
+++ b/application/applicationextension.inc.php
@@ -178,12 +178,12 @@ interface iLogoutExtension extends iLoginExtension
 	public function LogoutAction();
 }
 
-interface iLoginDataExtension extends iLoginExtension
+interface iLoginUIExtension extends iLoginExtension
 {
 	/**
 	 * @return LoginTwigData
 	 */
-	public function GetLoginData();
+	public function GetTwigBlockData();
 }
 
 
diff --git a/application/loginform.class.inc.php b/application/loginform.class.inc.php
index ae53f911e8..a68d7daf24 100644
--- a/application/loginform.class.inc.php
+++ b/application/loginform.class.inc.php
@@ -7,7 +7,7 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
-class LoginForm extends AbstractLoginFSMExtension implements iLoginDataExtension
+class LoginForm extends AbstractLoginFSMExtension implements iLoginUIExtension
 {
 	private $bForceFormOnError = false;
 
@@ -108,7 +108,7 @@ class LoginForm extends AbstractLoginFSMExtension implements iLoginDataExtension
 	 * @return LoginTwigData
 	 * @throws \Exception
 	 */
-	public function GetLoginData()
+	public function GetTwigBlockData()
 	{
 
 		$aPostedVars = array('auth_user', 'auth_pwd');
diff --git a/application/logintwig.class.inc.php b/application/logintwig.class.inc.php
index ed03ffb46a..64d98d0b31 100644
--- a/application/logintwig.class.inc.php
+++ b/application/logintwig.class.inc.php
@@ -112,14 +112,14 @@ class LoginTwigContext
 
 	public function __construct()
 	{
-		$this->aLoginPluginList = LoginWebPage::GetLoginPluginList('iLoginDataExtension', false);
+		$this->aLoginPluginList = LoginWebPage::GetLoginPluginList('iLoginUIExtension', false);
 		$this->aPluginFormData = array();
 		$aTwigLoaders = array();
 		$this->aPostedVars = array();
 		foreach ($this->aLoginPluginList as $oLoginPlugin)
 		{
-			/** @var \iLoginDataExtension $oLoginPlugin */
-			$oLoginData = $oLoginPlugin->GetLoginData();
+			/** @var \iLoginUIExtension $oLoginPlugin */
+			$oLoginData = $oLoginPlugin->GetTwigBlockData();
 			$this->aPluginFormData[] = $oLoginData;
 			$sTwigLoaderPath = $oLoginData->GetTwigLoaderPath();
 			if ($sTwigLoaderPath != null)
@@ -224,4 +224,4 @@ class LoginTwigContext
 	{
 		return $this->oTwig;
 	}
-}
\ No newline at end of file
+}
diff --git a/core/metamodel.class.php b/core/metamodel.class.php
index 3f3686c941..12a2eb3d84 100644
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -27,7 +27,7 @@ require_once APPROOT.'core/expressioncache.class.inc.php';
 
 
 /**
- * We need to have all iLoginFSMExtension/iLoginDataExtension impl loaded ! Cannot use autoloader...
+ * We need to have all iLoginFSMExtension/iLoginUIExtension impl loaded ! Cannot use autoloader...
  */
 require_once APPROOT.'application/loginform.class.inc.php';
 require_once APPROOT.'application/loginbasic.class.inc.php';
@@ -2794,7 +2794,7 @@ abstract class MetaModel
 
 		// Build the list of available extensions
 		//
-		$aInterfaces = array('iApplicationUIExtension', 'iPreferencesExtension', 'iApplicationObjectExtension', 'iLoginFSMExtension', 'iLoginDataExtension', 'iLogoutExtension', 'iQueryModifier', 'iOnClassInitialization', 'iPopupMenuExtension', 'iPageUIExtension', 'iPortalUIExtension', 'ModuleHandlerApiInterface', 'iNewsroomProvider');
+		$aInterfaces = array('iApplicationUIExtension', 'iPreferencesExtension', 'iApplicationObjectExtension', 'iLoginFSMExtension', 'iLoginUIExtension', 'iLogoutExtension', 'iQueryModifier', 'iOnClassInitialization', 'iPopupMenuExtension', 'iPageUIExtension', 'iPortalUIExtension', 'ModuleHandlerApiInterface', 'iNewsroomProvider');
 		foreach($aInterfaces as $sInterface)
 		{
 			self::$m_aExtensionClasses[$sInterface] = array();
diff --git a/datamodels/2.x/authent-cas/src/CASLoginExtension.php b/datamodels/2.x/authent-cas/src/CASLoginExtension.php
index 3091c2e237..628d71fc77 100644
--- a/datamodels/2.x/authent-cas/src/CASLoginExtension.php
+++ b/datamodels/2.x/authent-cas/src/CASLoginExtension.php
@@ -11,7 +11,7 @@ use AbstractLoginFSMExtension;
 use DBObjectSearch;
 use DBObjectSet;
 use Dict;
-use iLoginDataExtension;
+use iLoginUIExtension;
 use iLogoutExtension;
 use LoginBlockData;
 use LoginTwigData;
@@ -26,7 +26,7 @@ use utils;
 /**
  * Class CASLoginExtension
  */
-class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExtension, iLoginDataExtension
+class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExtension, iLoginUIExtension
 {
 	/**
 	 * Return the list of supported login modes for this plugin
@@ -200,7 +200,7 @@ class CASLoginExtension extends AbstractLoginFSMExtension implements iLogoutExte
 	/**
 	 * @return LoginTwigData
 	 */
-	public function GetLoginData()
+	public function GetTwigBlockData()
 	{
 		$sPath = APPROOT.'env-'.utils::GetCurrentEnvironment().'/authent-cas/view';
 		$oLoginData = new LoginTwigData(array(), $sPath);
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index f95e44de2c..e1a03a4048 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -1893,7 +1893,7 @@ return array(
     'iDBObjectSetIterator' => $baseDir . '/core/dbobjectiterator.php',
     'iDBObjectURLMaker' => $baseDir . '/application/applicationcontext.class.inc.php',
     'iDisplay' => $baseDir . '/core/dbobject.class.php',
-    'iLoginDataExtension' => $baseDir . '/application/applicationextension.inc.php',
+    'iLoginUIExtension' => $baseDir . '/application/applicationextension.inc.php',
     'iLoginExtension' => $baseDir . '/application/applicationextension.inc.php',
     'iLoginFSMExtension' => $baseDir . '/application/applicationextension.inc.php',
     'iLogoutExtension' => $baseDir . '/application/applicationextension.inc.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index 21061b8fc0..4d42f18550 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -2114,7 +2114,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'iDBObjectSetIterator' => __DIR__ . '/../..' . '/core/dbobjectiterator.php',
         'iDBObjectURLMaker' => __DIR__ . '/../..' . '/application/applicationcontext.class.inc.php',
         'iDisplay' => __DIR__ . '/../..' . '/core/dbobject.class.php',
-        'iLoginDataExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
+        'iLoginUIExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
         'iLoginExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
         'iLoginFSMExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
         'iLogoutExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',