diff --git a/Neos.ContentRepository.Core/Classes/NodeType/NodeType.php b/Neos.ContentRepository.Core/Classes/NodeType/NodeType.php
index 1099e8c6a38..94ab651a41c 100644
--- a/Neos.ContentRepository.Core/Classes/NodeType/NodeType.php
+++ b/Neos.ContentRepository.Core/Classes/NodeType/NodeType.php
@@ -223,15 +223,6 @@ protected function applyPostprocessing(array $fullConfiguration): array
         return $fullConfiguration;
     }
 
-    /**
-     * Returns the name of this node type
-     * @deprecated use "name" property directly
-     */
-    public function getName(): string
-    {
-        return $this->name->value;
-    }
-
     /**
      * Return boolean true if marked abstract
      */
diff --git a/Neos.Neos/Resources/Private/Fusion/Prototypes/Content.fusion b/Neos.Neos/Resources/Private/Fusion/Prototypes/Content.fusion
index fbd82078ffd..ced9c9d367f 100644
--- a/Neos.Neos/Resources/Private/Fusion/Prototypes/Content.fusion
+++ b/Neos.Neos/Resources/Private/Fusion/Prototypes/Content.fusion
@@ -18,7 +18,7 @@ prototype(Neos.Neos:Content) < prototype(Neos.Fusion:Template) {
   #   attributes.class.@process.nodeType >
   # }
   # in your site's Fusion if you don't need that behavior.
-  attributes.class.@process.nodeType = ${Array.push(value, String.toLowerCase(String.pregReplace(node.nodeType.name, '/[[:^alnum:]]/', '-')))}
+  attributes.class.@process.nodeType = ${Array.push(value, String.toLowerCase(String.pregReplace(node.nodeTypeName.value, '/[[:^alnum:]]/', '-')))}
 
   # The following line must not be removed as it adds required meta data to all content elements in backend
   @process.contentElementWrapping {
diff --git a/Neos.Neos/Resources/Private/Fusion/RawContent/Node.fusion b/Neos.Neos/Resources/Private/Fusion/RawContent/Node.fusion
index c977e308285..47ac7fb8562 100644
--- a/Neos.Neos/Resources/Private/Fusion/RawContent/Node.fusion
+++ b/Neos.Neos/Resources/Private/Fusion/RawContent/Node.fusion
@@ -1,6 +1,6 @@
 prototype(Neos.Neos:RawContent.Node) < prototype(Neos.Neos:ContentComponent) {
 
-  nodeType = ${node.nodeType.name}
+  nodeType = ${node.nodeTypeName.value}
 
   renderer = Neos.Fusion:Case {
     custom {
diff --git a/Neos.Neos/Resources/Private/Fusion/RootCase.fusion b/Neos.Neos/Resources/Private/Fusion/RootCase.fusion
index 1cb7a12197b..ea6596c38e7 100644
--- a/Neos.Neos/Resources/Private/Fusion/RootCase.fusion
+++ b/Neos.Neos/Resources/Private/Fusion/RootCase.fusion
@@ -30,9 +30,9 @@ root {
   documentType {
     @position = 'end 9998'
     condition = Neos.Fusion:CanRender {
-      type = ${documentNode.nodeType.name}
+      type = ${documentNode.nodeTypeName.value}
     }
-    type = ${documentNode.nodeType.name}
+    type = ${documentNode.nodeTypeName.value}
   }
 
   default {
@@ -53,7 +53,7 @@ root {
   error {
     @position = 'end 10001'
     condition = true
-    type = ${documentNode.nodeType.name}
+    type = ${documentNode.nodeTypeName.value}
   }
 
   @cache {
diff --git a/Neos.NodeTypes.Navigation/Resources/Private/Fusion/Root.fusion b/Neos.NodeTypes.Navigation/Resources/Private/Fusion/Root.fusion
index 4b6b91414fd..b4c1a4b2e40 100644
--- a/Neos.NodeTypes.Navigation/Resources/Private/Fusion/Root.fusion
+++ b/Neos.NodeTypes.Navigation/Resources/Private/Fusion/Root.fusion
@@ -12,7 +12,7 @@ prototype(Neos.NodeTypes.Navigation:Navigation) < prototype(Neos.Neos:Menu) {
   maximumLevels = ${q(node).property('maximumLevels')}
   maximumLevels.@process.1 = ${String.toInteger(value)}
 
-  attributes.class.@process.nodeType = ${Array.push(value, String.toLowerCase(String.pregReplace(node.nodeType.name, '/[[:^alnum:]]/', '-')))}
+  attributes.class.@process.nodeType = ${Array.push(value, String.toLowerCase(String.pregReplace(node.nodeTypeName.value, '/[[:^alnum:]]/', '-')))}
 
   active.attributes = Neos.Fusion:Attributes {
     class = 'active'