diff --git a/meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service b/meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service
similarity index 55%
rename from meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service
rename to meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service
index 0b9c0f559b..4828686952 100644
--- a/meta-systemd/meta-efl/recipes-efl/efl/elsa/xserver-nodm.service
+++ b/meta-systemd/meta-efl/recipes-efl/efl/entrance/xserver-nodm.service
@@ -2,7 +2,7 @@
 Description=Login manager for Enlightenment
 
 [Service]
-ExecStart=/usr/sbin/elsa
+ExecStart=/usr/sbin/entrance
 
 [Install]
-WantedBy=multi-user.target
+Alias=display-manager.service
diff --git a/meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend b/meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend
similarity index 100%
rename from meta-systemd/meta-efl/recipes-efl/efl/elsa_svn.bbappend
rename to meta-systemd/meta-efl/recipes-efl/efl/entrance_svn.bbappend