diff --git a/src/cuttlefish_conf.erl b/src/cuttlefish_conf.erl
index 8194b97..d8e197b 100644
--- a/src/cuttlefish_conf.erl
+++ b/src/cuttlefish_conf.erl
@@ -160,7 +160,7 @@ generate_element(MappingRecord) ->
     IncDef = cuttlefish_mapping:include_default(MappingRecord),
     [Datatype|_] = cuttlefish_mapping:datatype(MappingRecord),
     %% level != basic OR hidden == true: leave out of generated .conf file
-    %% commeneted $val: insert into .conf file, but commented out with $val
+    %% commented $val: insert into .conf file, but commented out with $val
     %% include_default $val:  substitute '$name' or whatever in the key for $val
     %%    e.g. {include_default, "internal"}
     %%         listener.http.$name -> listener.http.internal
diff --git a/src/cuttlefish_generator.erl b/src/cuttlefish_generator.erl
index 720a58a..7c9262c 100644
--- a/src/cuttlefish_generator.erl
+++ b/src/cuttlefish_generator.erl
@@ -129,8 +129,8 @@ map_validate(Schema, Conf) ->
 -spec apply_mappings(cuttlefish_schema:schema(), cuttlefish_conf:conf()) ->
                             {[proplists:property()], [string()]}.
 apply_mappings({Translations, Mappings, _Validators}, Conf) ->
-    %% This fold handles 1:1 mappings, that have no cooresponding translations
-    %% The accumlator is the app.config proplist that we start building from
+    %% This fold handles 1:1 mappings, that have no corresponding translations
+    %% The accumulator is the app.config proplist that we start building from
     %% these 1:1 mappings, hence the return "DirectMappings".
     %% It also builds a list of "TranslationsToDrop". It's basically saying that
     %% if a user didn't actually configure this setting in the .conf file and
@@ -486,8 +486,8 @@ value_sub(Var, Value, Conf, History) when is_list(Value) ->
                         SubVal ->
                             %% Do a sub-subsitution, in case the substituted
                             %% value contains substitutions itself. Do this as
-                            %% its own seperate recursion so that circular
-                            %% subtitutions can be detected.
+                            %% its own separate recursion so that circular
+                            %% substitutions can be detected.
                             case value_sub(NextVar, SubVal, Conf, [Var|History]) of
                                 {error, _} = Error ->
                                     Error;
diff --git a/src/cuttlefish_mapping.erl b/src/cuttlefish_mapping.erl
index 669fb28..045b4aa 100644
--- a/src/cuttlefish_mapping.erl
+++ b/src/cuttlefish_mapping.erl
@@ -114,7 +114,7 @@ parse(X) ->
 %% That something is usually a simple replace, unless the proplist in
 %% the raw mapping contains the atom 'merge'.
 %%
-%% This fuction assumes it's run as part of a foldl over new schema elements
+%% This function assumes it's run as part of a foldl over new schema elements
 %% in which case, there's only ever one instance of a key in the list
 %% so keyreplace works fine.
 -spec parse_and_merge(
@@ -280,7 +280,7 @@ mapping_test() ->
     ?assertEqual(["valid.the.impailer"], Record#mapping.validators),
     ?assertEqual(true, Record#mapping.hidden),
 
-    %% funciton tests
+    %% function tests
     ?assertEqual(["conf","key"], variable(Record)),
     ?assertEqual("default value", default(Record)),
     ?assertEqual("erlang.key", mapping(Record)),
diff --git a/test/riak.schema b/test/riak.schema
index 3406663..9c856d5 100644
--- a/test/riak.schema
+++ b/test/riak.schema
@@ -215,7 +215,7 @@
   {commented, "/tmp/erlserver.pem"}
 ]}.
 
-%% @doc if you need a seperate keyfile for handoff
+%% @doc if you need a separate keyfile for handoff
 {mapping, "handoff.ssl.keyfile", "riak_core.handoff_ssl_options.keyfile", []}.
 
 %% @doc DTrace support