2 files changed, 5 insertions, 2 deletions

diff --git a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/contentassist/ProblemCrossrefProposalProvider.java b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/contentassist/ProblemCrossrefProposalProvider.java
index ce5e7dad..ea90a82e 100644
--- a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/contentassist/ProblemCrossrefProposalProvider.java
+++ b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/contentassist/ProblemCrossrefProposalProvider.java
@@ -36,7 +36,10 @@ public class ProblemCrossrefProposalProvider extends IdeCrossrefProposalProvider
                 var eObjectDescriptionsByName = new HashMap<QualifiedName, List<IEObjectDescription>>();
                 for (var candidate : super.queryScope(scope, crossReference, context)) {
                         if (isExistingObject(candidate, crossReference, context)) {
-                                var qualifiedName = candidate.getQualifiedName();
+                                // {@code getQualifiedName()} will refer to the full name for objects that are loaded from the global
+                                // scope, but {@code getName()} returns the qualified name that we set in
+                                // {@code ProblemResourceDescriptionStrategy}.
+                                var qualifiedName = candidate.getName();
                                 var candidateList = eObjectDescriptionsByName.computeIfAbsent(qualifiedName,
                                                 ignored -> new ArrayList<>());
                                 candidateList.add(candidate);
diff --git a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
index 08747ec5..ae8c70e0 100644
--- a/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
+++ b/subprojects/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
@@ -95,7 +95,7 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
         }
 
         protected String[] getHighlightClass(EObject eObject, EReference reference) {
-                boolean isError = eObject instanceof PredicateDefinition predicateDefinition && predicateDefinition.isError();
+                boolean isError = ProblemUtil.isError(eObject);
                 if (ProblemUtil.isBuiltIn(eObject)) {
                         var className = isError ? ERROR_CLASS : BUILTIN_CLASS;
                         return new String[] { className };