diff --git a/.gitignore b/.gitignore
index 9339c13..c53de95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,7 +65,7 @@ Thumbs.db
 .checkstyle
 .factorypath
 run
-eclipse
+./eclipse
 nbproject
 atlassian-ide-plugin.xml
 build.xml
diff --git a/.gitmodules b/.gitmodules
index db51d64..eceb58f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "SpongeAPI"]
-       path = SpongeAPI
-       url = https://github.com/SpongePowered/SpongeAPI.git
+[submodule "SpongeCommon"]
+       path = SpongeCommon
+       url = https://github.com/SpongePowered/SpongeCommon.git
diff --git a/.travis.yml b/.travis.yml
index 0350564..34bfede 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,10 @@ jdk:
   - oraclejdk7
   - oraclejdk8

+git:
+  submodules: false
+before_install: git submodule update --init --recursive
+
 env: GRADLE_OPTS="-Xms1g -Xmx3g"
 install: ./gradlew setupCIWorkspace
 script: ./gradlew build
diff --git a/README.md b/README.md
index e6605ef..2cd6a5a 100644
--- a/README.md
+++ b/README.md
@@ -1,31 +1,31 @@
-SpongeCommon [![Build Status](https://travis-ci.org/SpongePowered/SpongeCommon.svg?branch=master)](https://travis-ci.org
+Sponge [![Build Status](https://travis-ci.org/SpongePowered/Sponge.svg?branch=master)](https://travis-ci.org/SpongePower
 =============

-**Currently not stable and under heavy development!**
+**Currently not stable and under heavy development!**

-Common code for official SpongeAPI implementations. It is licensed under the [MIT License].
+A Forge implementation of the Sponge API.

 * [Homepage]
 * [Source]
 * [Issues]
 * [Documentation]
-* [Community Chat]: [#sponge on irc.esper.net]
-* [Development Chat]: [#spongedev on irc.esper.net]
+* [Community Chat]: #sponge on irc.esper.net
+* [Development Chat]: #spongedev on irc.esper.net

 ## Prerequisites
-* [Java] 6
+* [Java] 6+