diff --git a/src/eleveleddb.app.src b/src/leveled.app.src
similarity index 81%
rename from src/eleveleddb.app.src
rename to src/leveled.app.src
index 37b004d..f6d6fd8 100644
--- a/src/eleveleddb.app.src
+++ b/src/leveled.app.src
@@ -1,4 +1,4 @@
-{application, eleveleddb,
+{application, leveled,
  [
   {description, "Key Value store based on LSM-Tree and designed for larger values"},
   {vsn, "1"},
@@ -7,6 +7,6 @@
                   kernel,
                   stdlib
                  ]},
-  {mod, { eleveleddb_app, []}},
+  {mod, { leveled_app, []}},
   {env, [{root_path, "test"}]}
  ]}.
diff --git a/src/eleveleddb_app.erl b/src/leveled_app.erl
similarity index 63%
rename from src/eleveleddb_app.erl
rename to src/leveled_app.erl
index 18f7546..3f40412 100644
--- a/src/eleveleddb_app.erl
+++ b/src/leveled_app.erl
@@ -1,4 +1,4 @@
--module(eleveleddb_app).
+-module(leveled_app).
 
 -behaviour(application).
 
@@ -9,8 +9,11 @@
 %% Application callbacks
 %% ===================================================================
 
+%% Currently this is just to keep dialyzer happy
+%% Run the store diretcly using leveled_bookie:book_start/4 or bookie_start/1
+
 start(_StartType, _StartArgs) ->
-    eleveleddb_sup:start_link().
+    leveled_sup:start_link().
 
 stop(_State) ->
     ok.
diff --git a/src/eleveleddb_sup.erl b/src/leveled_sup.erl
similarity index 82%
rename from src/eleveleddb_sup.erl
rename to src/leveled_sup.erl
index 391aca9..58d4b71 100644
--- a/src/eleveleddb_sup.erl
+++ b/src/leveled_sup.erl
@@ -1,4 +1,4 @@
--module(eleveleddb_sup).
+-module(leveled_sup).
 
 -behaviour(supervisor).
 
@@ -15,6 +15,9 @@
 %% API functions
 %% ===================================================================
 
+%% Currently this is just to keep dialyzer happy
+%% Run the store directly using leveled_bookie:book_start/4 or bookie_start/1
+
 start_link() ->
     supervisor:start_link({local, leveled_bookie}, ?MODULE, []).