diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
index bcef8a9..a54cb03 100644
--- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
+++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/DefaultMojoAnnotationsScanner.java
@@ -255,9 +255,8 @@ public class DefaultMojoAnnotationsScanner
 
         try
         {
-            // @Mojo annotations
-            MojoAnnotationVisitor mojoAnnotationVisitor =
-                mojoClassVisitor.getAnnotationVisitorMap().get( Mojo.class.getName() );
+            // @Mojo annotation
+            MojoAnnotationVisitor mojoAnnotationVisitor = mojoClassVisitor.getAnnotationVisitor( Mojo.class );
             if ( mojoAnnotationVisitor != null )
             {
                 MojoAnnotationContent mojoAnnotationContent = new MojoAnnotationContent();
@@ -265,8 +264,8 @@ public class DefaultMojoAnnotationsScanner
                 mojoAnnotatedClass.setMojo( mojoAnnotationContent );
             }
 
-            // @Execute annotations
-            mojoAnnotationVisitor = mojoClassVisitor.getAnnotationVisitorMap().get( Execute.class.getName() );
+            // @Execute annotation
+            mojoAnnotationVisitor = mojoClassVisitor.getAnnotationVisitor( Execute.class );
             if ( mojoAnnotationVisitor != null )
             {
                 ExecuteAnnotationContent executeAnnotationContent = new ExecuteAnnotationContent();
@@ -275,8 +274,7 @@ public class DefaultMojoAnnotationsScanner
             }
 
             // @Parameter annotations
-            List<MojoFieldVisitor> mojoFieldVisitors =
-                mojoClassVisitor.findFieldWithAnnotationClass( Parameter.class.getName() );
+            List<MojoFieldVisitor> mojoFieldVisitors = mojoClassVisitor.findFieldWithAnnotation( Parameter.class );
             for ( MojoFieldVisitor mojoFieldVisitor : mojoFieldVisitors )
             {
                 ParameterAnnotationContent parameterAnnotationContent =
@@ -290,7 +288,7 @@ public class DefaultMojoAnnotationsScanner
             }
 
             // @Component annotations
-            mojoFieldVisitors = mojoClassVisitor.findFieldWithAnnotationClass( Component.class.getName() );
+            mojoFieldVisitors = mojoClassVisitor.findFieldWithAnnotation( Component.class );
             for ( MojoFieldVisitor mojoFieldVisitor : mojoFieldVisitors )
             {
                 ComponentAnnotationContent componentAnnotationContent =
diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java
index 427035e..f2333d4 100644
--- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java
+++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/scanner/visitors/MojoClassVisitor.java
@@ -72,6 +72,11 @@ public class MojoClassVisitor
         return annotationVisitorMap;
     }
 
+    public MojoAnnotationVisitor getAnnotationVisitor( Class<?> annotation )
+    {
+        return annotationVisitorMap.get( annotation.getName() );
+    }
+
     public void setAnnotationVisitorMap( Map<String, MojoAnnotationVisitor> annotationVisitorMap )
     {
         this.annotationVisitorMap = annotationVisitorMap;
@@ -87,8 +92,10 @@ public class MojoClassVisitor
         this.fieldVisitors = fieldVisitors;
     }
 
-    public List<MojoFieldVisitor> findFieldWithAnnotationClass( String annotationClassName )
+    public List<MojoFieldVisitor> findFieldWithAnnotation( Class<?> annotation )
     {
+        String annotationClassName = annotation.getName();
+
         List<MojoFieldVisitor> mojoFieldVisitors = new ArrayList<MojoFieldVisitor>();
 
         for ( MojoFieldVisitor mojoFieldVisitor : this.fieldVisitors )