1 files changed, 6 insertions, 5 deletions

diff --git a/subprojects/language/src/main/java/tools/refinery/language/formatting2/ProblemFormatter.java b/subprojects/language/src/main/java/tools/refinery/language/formatting2/ProblemFormatter.java
index 0f3bd3ee..d6ece1ea 100644
--- a/subprojects/language/src/main/java/tools/refinery/language/formatting2/ProblemFormatter.java
+++ b/subprojects/language/src/main/java/tools/refinery/language/formatting2/ProblemFormatter.java
@@ -23,7 +23,7 @@ public class ProblemFormatter extends AbstractJavaFormatter {
         protected void format(Problem problem, IFormattableDocument doc) {
                 doc.prepend(problem, this::noSpace);
                 var region = regionFor(problem);
-                doc.append(region.keyword("problem"), this::oneSpace);
+                doc.prepend(region.feature(ProblemPackage.Literals.NAMED_ELEMENT__NAME), this::oneSpace);
                 doc.prepend(region.keyword("."), this::noSpace);
                 appendNewLines(doc, region.keyword("."), this::twoNewLines);
                 for (var statement : problem.getStatements()) {
@@ -132,10 +132,11 @@ public class ProblemFormatter extends AbstractJavaFormatter {
                 }
         }
 
-        protected void format(IndividualDeclaration individualDeclaration, IFormattableDocument doc) {
-                surroundNewLines(doc, individualDeclaration, this::singleNewLine);
-                var region = regionFor(individualDeclaration);
-                doc.append(region.keyword("indiv"), this::oneSpace);
+        protected void format(NodeDeclaration nodeDeclaration, IFormattableDocument doc) {
+                surroundNewLines(doc, nodeDeclaration, this::singleNewLine);
+                var region = regionFor(nodeDeclaration);
+                doc.append(region.keyword("declare"), this::oneSpace);
+                doc.append(region.feature(ProblemPackage.Literals.NODE_DECLARATION__KIND), this::oneSpace);
                 formatList(region, ",", doc);
                 doc.prepend(region.keyword("."), this::noSpace);
         }