*** empty log message ***

2 files changed, 7 insertions, 7 deletions

diff --git a/sources/scalac/checkers/CheckNames.java b/sources/scalac/checkers/CheckNames.java
index a129aa0236..9529a6b088 100644
--- a/sources/scalac/checkers/CheckNames.java
+++ b/sources/scalac/checkers/CheckNames.java
@@ -35,12 +35,12 @@ public class CheckNames extends Checker {
 		   "class " + Debug.show(tree.symbol()) +
 		   "should have a type name");
 
-	    Symbol constr = tree.symbol().constructor();
+	    Symbol constr = tree.symbol().primaryConstructor();
 	    verify(tree,
-		   constr.name.isConstrName(),
+		   constr.name.isTypeName(),
 		   "name kinds",
 		   "the class constructor " + Debug.show(constr)
-		   + " should have a constructor name");
+		   + " should have a type name");
 	    break;
 	}
     }
diff --git a/sources/scalac/checkers/CheckOwners.java b/sources/scalac/checkers/CheckOwners.java
index cabe120708..8ebd0b9f8f 100644
--- a/sources/scalac/checkers/CheckOwners.java
+++ b/sources/scalac/checkers/CheckOwners.java
@@ -54,7 +54,7 @@ public class CheckOwners extends Checker {
     protected void traverse(Template templ, Symbol owner) {
 	Symbol prevOwner = currentOwner;
 	if (owner.kind == Kinds.CLASS)
-	    currentOwner = owner.constructor();
+	    currentOwner = owner.primaryConstructor();
 	traverse(templ.parents);
 	currentOwner = owner;
 
@@ -103,8 +103,8 @@ public class CheckOwners extends Checker {
 		      Tree tpe,
                       Template impl): {
             check(tree);
-            traverse(tparams, tree.symbol().constructor());
-            traverse(vparams, tree.symbol().constructor());
+            traverse(tparams, tree.symbol().primaryConstructor());
+            traverse(vparams, tree.symbol().primaryConstructor());
 	    traverse(tpe);
             traverse(impl, tree.symbol());
         } break;
@@ -151,7 +151,7 @@ public class CheckOwners extends Checker {
             if (sym != null && sym != Symbol.NONE) {
                 checkOwner(tree, sym);
                 if (sym.kind == Kinds.CLASS)
-                    checkOwner(tree, sym.constructor());
+                    checkOwner(tree, sym.primaryConstructor());
             }
         }
     }