diff --git a/priv/templates/app.erl b/priv/templates/app.erl
index 83eb9a31..2e7b9093 100644
--- a/priv/templates/app.erl
+++ b/priv/templates/app.erl
@@ -3,7 +3,7 @@
 %% @end
 %%%-------------------------------------------------------------------
 
--module({{name}}_app).
+-module('{{name}}_app').
 
 -behaviour(application).
 
@@ -16,7 +16,7 @@
 %%====================================================================
 
 start(_StartType, _StartArgs) ->
-    {{name}}_sup:start_link().
+    '{{name}}_sup':start_link().
 
 %%--------------------------------------------------------------------
 stop(_State) ->
diff --git a/priv/templates/escript_mod.erl b/priv/templates/escript_mod.erl
index f8a779ba..dd2feb8e 100644
--- a/priv/templates/escript_mod.erl
+++ b/priv/templates/escript_mod.erl
@@ -1,4 +1,4 @@
--module({{name}}).
+-module('{{name}}').
 
 %% API exports
 -export([main/1]).
diff --git a/priv/templates/escript_rebar.config b/priv/templates/escript_rebar.config
index 196f835a..c0a33015 100644
--- a/priv/templates/escript_rebar.config
+++ b/priv/templates/escript_rebar.config
@@ -2,9 +2,9 @@
 {deps, []}.
 
 {escript_incl_apps,
- [{{name}}]}.
-{escript_top_level_app, {{name}}}.
-{escript_name, {{name}}}.
+ ['{{name}}']}.
+{escript_top_level_app, '{{name}}'}.
+{escript_name, '{{name}}'}.
 {escript_emu_args, "%%! +sbtu +A0\n"}.
 
 %% Profiles
diff --git a/priv/templates/mod.erl b/priv/templates/mod.erl
index 2f5e09ea..208307e8 100644
--- a/priv/templates/mod.erl
+++ b/priv/templates/mod.erl
@@ -1,4 +1,4 @@
--module({{name}}).
+-module('{{name}}').
 
 %% API exports
 -export([]).
diff --git a/priv/templates/otp_app.app.src b/priv/templates/otp_app.app.src
index d5ea3d2b..9ad74787 100644
--- a/priv/templates/otp_app.app.src
+++ b/priv/templates/otp_app.app.src
@@ -1,4 +1,4 @@
-{application, {{name}},
+{application, '{{name}}',
  [{description, "{{desc}}"},
   {vsn, "0.1.0"},
   {registered, []},
diff --git a/priv/templates/otp_lib.app.src b/priv/templates/otp_lib.app.src
index 6af7640c..3f4b56b7 100644
--- a/priv/templates/otp_lib.app.src
+++ b/priv/templates/otp_lib.app.src
@@ -1,4 +1,4 @@
-{application, {{name}},
+{application, '{{name}}',
  [{description, "{{desc}}"},
   {vsn, "0.1.0"},
   {registered, []},
diff --git a/priv/templates/plugin.erl b/priv/templates/plugin.erl
index abf4648a..018dd0e5 100644
--- a/priv/templates/plugin.erl
+++ b/priv/templates/plugin.erl
@@ -1,9 +1,9 @@
--module({{name}}).
+-module('{{name}}').
 -behaviour(provider).
 
 -export([init/1, do/1, format_error/1]).
 
--define(PROVIDER, {{name}}).
+-define(PROVIDER, '{{name}}').
 -define(DEPS, [app_discovery]).
 
 %% ===================================================================
diff --git a/priv/templates/relx_rebar.config b/priv/templates/relx_rebar.config
index e7505ebd..da328193 100644
--- a/priv/templates/relx_rebar.config
+++ b/priv/templates/relx_rebar.config
@@ -2,7 +2,7 @@
 {deps, []}.
 
 {relx, [{release, {'{{name}}', "0.1.0"},
-         [{{name}},
+         ['{{name}}',
           sasl]},
 
         {sys_config, "./config/sys.config"},
diff --git a/priv/templates/sup.erl b/priv/templates/sup.erl
index a2e72098..cd9192a0 100644
--- a/priv/templates/sup.erl
+++ b/priv/templates/sup.erl
@@ -3,7 +3,7 @@
 %% @end
 %%%-------------------------------------------------------------------
 
--module({{name}}_sup).
+-module('{{name}}_sup').
 
 -behaviour(supervisor).