diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Goal.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Mojo.java
similarity index 96%
rename from maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Goal.java
rename to maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Mojo.java
index b56bd1f..2e1099f 100644
--- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Goal.java
+++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/Mojo.java
@@ -34,7 +34,7 @@ import java.lang.annotation.Target;
 @Retention( RetentionPolicy.RUNTIME )
 @Target( ElementType.TYPE )
 @Inherited
-public @interface Goal
+public @interface Mojo
 {
     String name();
 
@@ -61,4 +61,6 @@ public @interface Goal
     boolean inheritByDefault() default true;
 
     String configurator() default "";
+
+    boolean threadSafe() default false;
 }
diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/ThreadSafe.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/ThreadSafe.java
deleted file mode 100644
index 4ad2389..0000000
--- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/ThreadSafe.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.apache.maven.tools.plugin.annotations;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-
-/**
- * @author Olivier Lamy
- * @since 3.0
- */
-
-@Documented
-@Inherited
-@Retention( RetentionPolicy.RUNTIME )
-@Target( { ElementType.TYPE } )
-public @interface ThreadSafe
-{
-    boolean value() default true;
-}