diff --git a/src/main/jastadd/Backend.jadd b/src/main/jastadd/Backend.jadd
index db6e1bce2665b1f078dc8fa073117ca786a8f6b6..569d61b473639b9ef0ad2146b96543ab66109d5a 100644
--- a/src/main/jastadd/Backend.jadd
+++ b/src/main/jastadd/Backend.jadd
@@ -656,7 +656,7 @@ aspect NameResolutionHelper {
     String superType = this.getSuper().getID();
 
     sb.append(ind(1) + "// context-independent name resolution\n");
-    sb.append(ind(1) + "syn " + superType + " ASTNode.resolve" + superType + "ByToken(String id) {\n");
+    sb.append(ind(1) + "syn " + superType + " ASTNode.globallyResolve" + superType + "ByToken(String id) {\n");
       sb.append(ind(2) + "// perform context independent name resolution here using the id\n");
       sb.append(ind(2) + "throw new RuntimeException(\"Context-independent name resolution for "+ superType + " not implemented.\");\n");
     sb.append(ind(1) + "}\n");
@@ -690,7 +690,7 @@ aspect NameResolutionHelper {
     sb.append(ind(1) + "// context-dependent name resolution\n");
     sb.append(ind(1) + "syn " + ofTypeDecl() + " " + toTypeDecl() + ".resolve" + nameCapitalized() + "ByToken(String id, int position) {\n");
       sb.append(ind(2) + "// default to context-independent name resolution\n");
-      sb.append(ind(2) + "return resolve" + ofTypeDecl() + "ByToken(id);\n");
+      sb.append(ind(2) + "return globallyResolve" + ofTypeDecl() + "ByToken(id);\n");
     sb.append(ind(1) + "}\n");
   }
 
@@ -703,7 +703,7 @@ aspect NameResolutionHelper {
     sb.append(ind(1) + "// context-dependent name resolution\n");
     sb.append(ind(1) + "syn " + ofTypeDecl() + " " + toTypeDecl() + ".resolve" + nameCapitalized() + "ByToken(String id) {\n");
       sb.append(ind(2) + "// default to context-independent name resolution\n");
-      sb.append(ind(2) + "return resolve" + ofTypeDecl() + "ByToken(id);\n");
+      sb.append(ind(2) + "return globallyResolve" + ofTypeDecl() + "ByToken(id);\n");
     sb.append(ind(1) + "}\n");
   }
 
diff --git a/src/test/jastadd/resolver/MyRefResolver.jadd b/src/test/jastadd/resolver/MyRefResolver.jadd
index e45c5a91e0f1a3db05590b3abc82a824579a0102..fa585c919296a0ea027cd06caf679cb9a5b62a00 100644
--- a/src/test/jastadd/resolver/MyRefResolver.jadd
+++ b/src/test/jastadd/resolver/MyRefResolver.jadd
@@ -1,19 +1,19 @@
 aspect MyRewrites {
 
   // context-independent name resolution
-  refine RefResolverStubs eq ASTNode.resolveNamedElementByToken(String id) {
+  refine RefResolverStubs eq ASTNode.globallyResolveNamedElementByToken(String id) {
     System.out.println("resolving " + id + " to " + root().findNamedElement(id));
     return root().findNamedElement(id);
   }
 
   // context-independent name resolution
-  refine RefResolverStubs eq ASTNode.resolveAByToken(String id) {
+  refine RefResolverStubs eq ASTNode.globallyResolveAByToken(String id) {
     System.out.println("resolving " + id + " to " + root().findNamedElement(id));
     return root().findA(id);
   }
 
   // context-independent name resolution
-  refine RefResolverStubs eq ASTNode.resolveBByToken(String id) {
+  refine RefResolverStubs eq ASTNode.globallyResolveBByToken(String id) {
     System.out.println("resolving " + id + " to " + root().findNamedElement(id));
     return root().findB(id);
   }