diff --git a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/bug/tests/Bug405061Test.java b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/bug/tests/Bug405061Test.java
index 4d900fe..89afd7e 100644
--- a/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/bug/tests/Bug405061Test.java
+++ b/tests/org.eclipse.uml2.uml.tests/src/org/eclipse/uml2/uml/bug/tests/Bug405061Test.java
@@ -98,7 +98,7 @@
 		assertNull("Original name should not have been recorded.",
 			EcoreUtil.getAnnotation(property,
 				UMLUtil.UML2_UML_PACKAGE_2_0_NS_URI,
-				PrivateUMLUtil.ANNOTATION_DETAIL__ORIGINAL_NAME));
+				PrivateUML2EcoreConverter.ANNOTATION_DETAIL__ORIGINAL_NAME));
 	}
 
 	public void testValidateButNoCamelCaseOption() {
@@ -174,7 +174,8 @@
 	}
 
 	void assertOriginalName(String expectedName, ENamedElement element) {
-		assertEquals(expectedName, UMLUtil.getOriginalName(element));
+		assertEquals(expectedName,
+			UMLUtil.UML2EcoreConverter.getOriginalName(element));
 	}
 
 	void assertNotAnnotated(Element umlElement) {
@@ -196,9 +197,9 @@
 			URI.createURI(url.toExternalForm()), UMLPackage.Literals.PACKAGE);
 	}
 
-	protected static class PrivateUMLUtil
-			extends UMLUtil {
+	protected static class PrivateUML2EcoreConverter
+			extends UMLUtil.UML2EcoreConverter {
 
-		static final String ANNOTATION_DETAIL__ORIGINAL_NAME = UMLUtil.ANNOTATION_DETAIL__ORIGINAL_NAME;
+		static final String ANNOTATION_DETAIL__ORIGINAL_NAME = UMLUtil.UML2EcoreConverter.ANNOTATION_DETAIL__ORIGINAL_NAME;
 	}
 }