diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9ffa30c..639c50c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,7 +9,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:name=".ExtendedApplication">
+        android:name=".App">
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/io/github/chronosx88/influence/ExtendedApplication.java b/app/src/main/java/io/github/chronosx88/influence/App.java
similarity index 89%
rename from app/src/main/java/io/github/chronosx88/influence/ExtendedApplication.java
rename to app/src/main/java/io/github/chronosx88/influence/App.java
index 93f32df..2fd64b9 100644
--- a/app/src/main/java/io/github/chronosx88/influence/ExtendedApplication.java
+++ b/app/src/main/java/io/github/chronosx88/influence/App.java
@@ -7,7 +7,7 @@ import android.content.Context;
  * Extended Application class which designed for getting Context from anywhere in the application.
  */
 
-public class ExtendedApplication extends Application {
+public class App extends Application {
     private static Application instance;
 
     @Override
diff --git a/app/src/main/java/io/github/chronosx88/influence/kademlia/DefaultConfiguration.java b/app/src/main/java/io/github/chronosx88/influence/kademlia/DefaultConfiguration.java
index 737ff89..a70c6f0 100644
--- a/app/src/main/java/io/github/chronosx88/influence/kademlia/DefaultConfiguration.java
+++ b/app/src/main/java/io/github/chronosx88/influence/kademlia/DefaultConfiguration.java
@@ -2,7 +2,7 @@ package io.github.chronosx88.influence.kademlia;
 
 import java.io.File;
 
-import io.github.chronosx88.influence.ExtendedApplication;
+import io.github.chronosx88.influence.App;
 
 /**
  * A set of Kademlia configuration parameters. Default values are
@@ -77,7 +77,7 @@ public class DefaultConfiguration implements KadConfiguration
     public String getNodeDataFolder(String ownerId)
     {
         /* Setup the main storage folder if it doesn't exist */
-        String path = ExtendedApplication.getContext().getFilesDir() + File.separator + DefaultConfiguration.LOCAL_FOLDER;
+        String path = App.getContext().getFilesDir() + File.separator + DefaultConfiguration.LOCAL_FOLDER;
         File folder = new File(path);
         if (!folder.isDirectory())
         {