diff --git a/CustomDictionary.xml b/CustomDictionary.xml
index 77af885ef..f998f9ecf 100644
--- a/CustomDictionary.xml
+++ b/CustomDictionary.xml
@@ -5,6 +5,9 @@
       <Word>ssh</Word>
       <Word>git</Word>
       <Word>gravatar</Word>
+      <Word>dto</Word>
+      <Word>rss</Word>
+      <Word>submodule</Word>
     </Recognized>
   </Words>
 </Dictionary>
diff --git a/GitCommands/Config/ConfigFile.cs b/GitCommands/Config/ConfigFile.cs
index 78cfcb58e..81bac0dea 100644
--- a/GitCommands/Config/ConfigFile.cs
+++ b/GitCommands/Config/ConfigFile.cs
@@ -118,7 +118,7 @@ namespace GitCommands.Config
             try
             {
                 FileInfoExtensions
-                    .MakeFileTemporaryWriteable(_fileName,
+                    .MakeFileTemporaryWritable(_fileName,
                                        x =>
                                        File.WriteAllText(_fileName, configFileContent.ToString(), Settings.Encoding));
             }
diff --git a/GitCommands/FileInfoExtensions.cs b/GitCommands/FileInfoExtensions.cs
index 308ba5099..4c55a360b 100644
--- a/GitCommands/FileInfoExtensions.cs
+++ b/GitCommands/FileInfoExtensions.cs
@@ -9,7 +9,7 @@ namespace GitCommands
         ///   Remove all attributes that could cause the file to be read-only 
         ///   and restores them later
         /// </summary>
-        public static void MakeFileTemporaryWriteable(string fileName, Action<string> writableAction)
+        public static void MakeFileTemporaryWritable(string fileName, Action<string> writableAction)
         {
             var fileInfo = new FileInfo(fileName);
             if (!fileInfo.Exists)
diff --git a/GitCommands/Git/GitCommandsHelper.cs b/GitCommands/Git/GitCommandsHelper.cs
index 40809201c..198ad0f73 100644
--- a/GitCommands/Git/GitCommandsHelper.cs
+++ b/GitCommands/Git/GitCommandsHelper.cs
@@ -845,7 +845,7 @@ namespace GitCommands
             return "branch \"" + branchName.Trim() + "\" \"" + revision + "\"";
         }
 
-        public static void UnSetSsh()
+        public static void UnsetSsh()
         {
             Environment.SetEnvironmentVariable("GIT_SSH", "", EnvironmentVariableTarget.Process);
         }
@@ -1252,9 +1252,9 @@ namespace GitCommands
             return RunCmd(Settings.GitCommand, "remote rm \"" + name + "\"");
         }
 
-        public static string RenameRemote(string name, string newname)
+        public static string RenameRemote(string name, string newName)
         {
-            return RunCmd(Settings.GitCommand, "remote rename \"" + name + "\" \"" + newname + "\"");
+            return RunCmd(Settings.GitCommand, "remote rename \"" + name + "\" \"" + newName + "\"");
         }
 
         public static string AddRemote(string name, string path)
@@ -1309,7 +1309,7 @@ namespace GitCommands
             return configFile.GetValue(setting);
         }
 
-        public static void UnSetSetting(string setting)
+        public static void UnsetSetting(string setting)
         {
             var configFile = GetLocalConfig();
             configFile.RemoveSetting(setting);
diff --git a/GitCommands/Git/GitHead.cs b/GitCommands/Git/GitHead.cs
index 0ce1cc02e..afcec9c5c 100644
--- a/GitCommands/Git/GitHead.cs
+++ b/GitCommands/Git/GitHead.cs
@@ -54,7 +54,7 @@ namespace GitCommands
             set
             {
                 if (String.IsNullOrEmpty(value))
-                    GitCommandHelpers.UnSetSetting(_remoteSettingName);
+                    GitCommandHelpers.UnsetSetting(_remoteSettingName);
                 else
                 {
                     GitCommandHelpers.SetSetting(_remoteSettingName, value);
@@ -75,7 +75,7 @@ namespace GitCommands
             set
             {
                 if (String.IsNullOrEmpty(value))
-                    GitCommandHelpers.UnSetSetting(_mergeSettingName);
+                    GitCommandHelpers.UnsetSetting(_mergeSettingName);
                 else
                     GitCommandHelpers.SetSetting(_mergeSettingName, "refs/heads/" + value);
             }
diff --git a/GitCommands/System.cs b/GitCommands/System.cs
index 4e99f7b85..6f9234bed 100644
--- a/GitCommands/System.cs
+++ b/GitCommands/System.cs
@@ -14,9 +14,9 @@ namespace System
 
     public static class Tuple
     {
-        public static Tuple<T, S> Create<T, S>(T item1, S item2)
+        public static Tuple<T1, T2> Create<T1, T2>(T1 item1, T2 item2)
         {
-            return new Tuple<T, S>(item1, item2);
+            return new Tuple<T1, T2>(item1, item2);
         }
     }
 }
diff --git a/GitCommands/patch/Patch.cs b/GitCommands/patch/Patch.cs
index 47b4e69d5..f32e1a31d 100644
--- a/GitCommands/patch/Patch.cs
+++ b/GitCommands/patch/Patch.cs
@@ -11,7 +11,7 @@ namespace PatchApply
         public Patch()
         {
             Apply = true;
-            BookMarks = new List<int>();
+            Bookmarks = new List<int>();
             File = FileType.Text;
         }
 
@@ -35,7 +35,7 @@ namespace PatchApply
         public int Rate { get; set; }
         public bool Apply { get; set; }
 
-        public List<int> BookMarks { get; set; }
+        public List<int> Bookmarks { get; set; }
 
         public PatchType Type { get; set; }
 
diff --git a/GitCommands/patch/PatchManager.cs b/GitCommands/patch/PatchManager.cs
index e75867c11..12065e7e6 100644
--- a/GitCommands/patch/PatchManager.cs
+++ b/GitCommands/patch/PatchManager.cs
@@ -163,7 +163,7 @@ namespace PatchApply
                             patch.Rate -= 20;
                     }
 
-                    patch.BookMarks.Add(lineNumber);
+                    patch.Bookmarks.Add(lineNumber);
 
                     if (fileLines.Count > lineNumber)
                         fileLines.RemoveAt(lineNumber);
@@ -185,7 +185,7 @@ namespace PatchApply
                     }
 
                     fileLines.Insert(lineNumber, insertLine);
-                    patch.BookMarks.Add(lineNumber);
+                    patch.Bookmarks.Add(lineNumber);
 
                     lineNumber++;
                 }
diff --git a/GitUI/FormAddToGitIgnore.cs b/GitUI/FormAddToGitIgnore.cs
index 57f266424..31488b552 100644
--- a/GitUI/FormAddToGitIgnore.cs
+++ b/GitUI/FormAddToGitIgnore.cs
@@ -21,7 +21,7 @@ namespace GitUI
             try
             {
                 FileInfoExtensions
-                    .MakeFileTemporaryWriteable(Settings.WorkingDir + ".gitignore",
+                    .MakeFileTemporaryWritable(Settings.WorkingDir + ".gitignore",
                                        x =>
                                        {
                                            var gitIgnoreFile = new StringBuilder();
diff --git a/GitUI/FormCherryPickCommitSmall.cs b/GitUI/FormCherryPickCommitSmall.cs
index 53322bae3..48f16f2a1 100644
--- a/GitUI/FormCherryPickCommitSmall.cs
+++ b/GitUI/FormCherryPickCommitSmall.cs
@@ -6,9 +6,9 @@ namespace GitUI
 {
     public partial class FormCherryPickCommitSmall : GitExtensionsForm
     {
-        public FormCherryPickCommitSmall(GitRevision Revision)
+        public FormCherryPickCommitSmall(GitRevision revision)
         {
-            this.Revision = Revision;
+            this.Revision = revision;
 
             InitializeComponent(); Translate();
         }
diff --git a/GitUI/FormGitAttributes.cs b/GitUI/FormGitAttributes.cs
index a6f534749..33403eb4d 100644
--- a/GitUI/FormGitAttributes.cs
+++ b/GitUI/FormGitAttributes.cs
@@ -33,7 +33,7 @@ namespace GitUI
         private void SaveClick(object sender, EventArgs e)
         {
             FileInfoExtensions
-                .MakeFileTemporaryWriteable(
+                .MakeFileTemporaryWritable(
                     Settings.WorkingDir + ".gitattributes",
                     x =>
                         {
diff --git a/GitUI/FormGitIgnore.cs b/GitUI/FormGitIgnore.cs
index 4cee03f15..c1b3eefbe 100644
--- a/GitUI/FormGitIgnore.cs
+++ b/GitUI/FormGitIgnore.cs
@@ -34,7 +34,7 @@ namespace GitUI
             try
             {
                 FileInfoExtensions
-                    .MakeFileTemporaryWriteable(
+                    .MakeFileTemporaryWritable(
                         Settings.WorkingDir + ".gitignore",
                         x =>
                             {
diff --git a/GitUI/FormMailMap.cs b/GitUI/FormMailMap.cs
index 5b1e35070..5aebec235 100644
--- a/GitUI/FormMailMap.cs
+++ b/GitUI/FormMailMap.cs
@@ -32,7 +32,7 @@ namespace GitUI
         private void SaveClick(object sender, EventArgs e)
         {
             FileInfoExtensions
-                .MakeFileTemporaryWriteable(
+                .MakeFileTemporaryWritable(
                     Settings.WorkingDir + ".mailmap",
                     x =>
                         {
diff --git a/GitUI/FormSettings.cs b/GitUI/FormSettings.cs
index bd258248b..ce38cf0ae 100644
--- a/GitUI/FormSettings.cs
+++ b/GitUI/FormSettings.cs
@@ -456,7 +456,7 @@ namespace GitUI
             }
 
             if (OpenSSH.Checked)
-                GitCommandHelpers.UnSetSsh();
+                GitCommandHelpers.UnsetSsh();
 
             if (Putty.Checked)
                 GitCommandHelpers.SetSsh(PlinkPath.Text);