diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 08ee96d..c7a14c7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,7 +31,7 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
         android:label="Yaaic"
         android:theme="@style/Theme.Yaaic"
         android:allowBackup="true"
-        android:name=".ApplicationController">
+        android:name=".YaaicApplication">
         <activity android:name=".activity.MainActivity"
             android:label="@string/app_name"
             android:launchMode="standard" >
diff --git a/app/src/main/java/org/yaaic/ApplicationController.java b/app/src/main/java/org/yaaic/YaaicApplication.java
similarity index 94%
rename from app/src/main/java/org/yaaic/ApplicationController.java
rename to app/src/main/java/org/yaaic/YaaicApplication.java
index 3b993f5..7fff151 100644
--- a/app/src/main/java/org/yaaic/ApplicationController.java
+++ b/app/src/main/java/org/yaaic/YaaicApplication.java
@@ -25,7 +25,7 @@ import android.app.Application;
 /**
  * Application implementation for Yaaic.
  */
-public class ApplicationController extends Application {
+public class YaaicApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();