diff --git a/ebin/eNpc.app b/ebin/eNpc.app
index 53d695d..661e728 100644
--- a/ebin/eNpc.app
+++ b/ebin/eNpc.app
@@ -1,9 +1,12 @@
-{application,eNpc,
-             [{description,"eNpc: Erlang Native Compiler"},
-              {vsn,"0.1.0"},
-              {registered,[]},
-              {applications,[kernel,stdlib]},
-              {modules,[eNpc,rebar,rebarConfig,rebarNpCompiler,rebarUtils]},
-              {licenses,["Apache 2.0"]},
-              {links,[]},
-              {env,[{log_level,warn}]}]}.
+{application, eNpc,
+   [
+      {description, "eNpc: Erlang Native Compiler"},
+      {vsn, "0.1.0"},
+      {registered, []},
+      {applications, [kernel, stdlib]},
+      {modules, [eNpc, npRMain, npRConfig, npRCompiler, npRUtils]},
+      {licenses, ["Apache 2.0"]},
+      {links, []},
+      {env, [{log_level, warn}]}
+   ]
+}.
diff --git a/src/npRMain.erl b/src/npRMain.erl
index 19afc4b..d319ef4 100644
--- a/src/npRMain.erl
+++ b/src/npRMain.erl
@@ -162,15 +162,15 @@ runAux(BaseConfig, Commands) ->
 
    %% Make sure we're an app directory
     AppFile = "",
-   %%    case rebarUtils:isAppDir() of
+   %%    case npRUtils:isAppDir() of
    %%       {true, AppFile0} ->
    %%          AppFile0;
    %%       false ->
-   %%          rebarUtils:delayedHalt(1)
+   %%          npRUtils:delayedHalt(1)
    %%    end,
 
    % Setup our environment
-   BaseConfig2 = setupEnvs(BaseConfig1, [rebarNpCompiler]),
+   BaseConfig2 = setupEnvs(BaseConfig1, [npRCompiler]),
    %% Process each command, resetting any state between each one
    lists:foreach(
       fun(Command) ->