diff --git a/.project b/.project
index cdb221c..db43a81 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>grails-tomcat8</name>
+	<name>tomcat</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -26,7 +26,7 @@
 		<link>
 			<name>.link_to_grails_plugins</name>
 			<type>2</type>
-			<location>/home/burt/workspace.grails/plugins/grails-tomcat8-plugin/target/plugins</location>
+			<locationURI>GRAILS_ROOT/grails-tomcat-plugin/target/plugins</locationURI>
 		</link>
 	</linkedResources>
 </projectDescription>
diff --git a/TomcatGrailsPlugin.groovy b/TomcatGrailsPlugin.groovy
index bf29e29..f9ce655 100644
--- a/TomcatGrailsPlugin.groovy
+++ b/TomcatGrailsPlugin.groovy
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-class Tomcat8GrailsPlugin {
+class TomcatGrailsPlugin {
 	def version = '8.0.5.1-SNAPSHOT'
 	def grailsVersion = '2.3 > *'
 	def scopes = [excludes: 'war']
diff --git a/scripts/_Events.groovy b/scripts/_Events.groovy
index 3a96550..ae18bb6 100644
--- a/scripts/_Events.groovy
+++ b/scripts/_Events.groovy
@@ -8,7 +8,7 @@ eventCreatePluginArchiveStart = { stagingDir ->
 		return
 	}
 
-	ant.jar(destfile: "$stagingDir/grails-plugin-tomcat8-${plugin.version}.jar", filesonly: true) {
+	ant.jar(destfile: "$stagingDir/grails-plugin-tomcat-${plugin.version}.jar", filesonly: true) {
 		fileset(dir: classesDir, includes: 'org/grails/plugins/tomcat/**/*.class')
 	}
 }
diff --git a/travis-build.sh b/travis-build.sh
index e58abe6..87ac77d 100755
--- a/travis-build.sh
+++ b/travis-build.sh
@@ -16,7 +16,7 @@ plugin=${plugin/"-$version"/}
 
 echo "Publishing plugin $plugin with version $version"
 
-if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_REPO_SLUG == "grails-plugins/grails-tomcat8-plugin" && $TRAVIS_PULL_REQUEST == 'false' ]]; then
+if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_REPO_SLUG == "grails-plugins/grails-tomcat-plugin" && $TRAVIS_PULL_REQUEST == 'false' ]]; then
   git config --global user.name "$GIT_NAME"
   git config --global user.email "$GIT_EMAIL"
   git config --global credential.helper "store --file=~/.git-credentials"