diff --git a/.gitignore b/.gitignore
index de30b3d..3789ee3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ c_src/tinySTM/
 ebin/
 .eunit/
 priv/
+*.o
diff --git a/c_src/stm_erl.c b/c_src/stm_erl.c
index cbcf872..437cc4c 100644
--- a/c_src/stm_erl.c
+++ b/c_src/stm_erl.c
@@ -90,7 +90,7 @@ static int on_load(ErlNifEnv* env, void** priv_data, ERL_NIF_TERM load_info)
 {
     ErlNifResourceFlags flags = (ErlNifResourceFlags)(ERL_NIF_RT_CREATE | ERL_NIF_RT_TAKEOVER);
     stm_erl_RESOURCE = enif_open_resource_type(env,
-                                            "stm_erl",
+                                            "stm",
                                             "stm_erl_resource",
                                             &stm_erl_resource_resource_cleanup,
                                             flags,
@@ -110,4 +110,4 @@ static ErlNifFunc nif_funcs[] =
     {"load_var", 1, stm_erl_load_var}
 };
 
-ERL_NIF_INIT(stm_erl, nif_funcs, &on_load, NULL, NULL, NULL);
+ERL_NIF_INIT(stm, nif_funcs, &on_load, NULL, NULL, NULL);
diff --git a/c_src/stm_erl.o b/c_src/stm_erl.o
deleted file mode 100644
index 8d721f8..0000000
Binary files a/c_src/stm_erl.o and /dev/null differ
diff --git a/src/stm_erl.app.src b/src/stm.app.src
similarity index 76%
rename from src/stm_erl.app.src
rename to src/stm.app.src
index f04a456..aa18b79 100644
--- a/src/stm_erl.app.src
+++ b/src/stm.app.src
@@ -1,4 +1,4 @@
-{application, stm_erl,
+{application, stm,
  [
   {description, ""},
   {vsn, "1"},
@@ -7,6 +7,6 @@
                   kernel,
                   stdlib
                  ]},
-  {mod, { stm_erl_app, []}},
+  {mod, { stm_app, []}},
   {env, []}
  ]}.
diff --git a/src/stm_erl.erl b/src/stm.erl
similarity index 99%
rename from src/stm_erl.erl
rename to src/stm.erl
index 18b1b62..4c2dd6d 100644
--- a/src/stm_erl.erl
+++ b/src/stm.erl
@@ -1,4 +1,4 @@
--module(stm_erl).
+-module(stm).
 -author("Ian Plosker").
 
 -compile(export_all).
diff --git a/src/stm_erl_app.erl b/src/stm_app.erl
similarity index 85%
rename from src/stm_erl_app.erl
rename to src/stm_app.erl
index 7920b1e..01c199a 100644
--- a/src/stm_erl_app.erl
+++ b/src/stm_app.erl
@@ -1,4 +1,4 @@
--module(stm_erl_app).
+-module(stm_app).
 
 -behaviour(application).
 
@@ -10,7 +10,7 @@
 %% ===================================================================
 
 start(_StartType, _StartArgs) ->
-    stm_erl_sup:start_link().
+    stm_sup:start_link().
 
 stop(_State) ->
     ok.
diff --git a/src/stm_erl_sup.erl b/src/stm_sup.erl
similarity index 96%
rename from src/stm_erl_sup.erl
rename to src/stm_sup.erl
index b81d77e..343eb05 100644
--- a/src/stm_erl_sup.erl
+++ b/src/stm_sup.erl
@@ -1,5 +1,5 @@
 
--module(stm_erl_sup).
+-module(stm_sup).
 
 -behaviour(supervisor).