diff --git a/Rubberduck.CodeAnalysis/Inspections/CodeInspectionType.cs b/Rubberduck.CodeAnalysis/Inspections/CodeInspectionType.cs
index c5965218ad..c495bb7ada 100644
--- a/Rubberduck.CodeAnalysis/Inspections/CodeInspectionType.cs
+++ b/Rubberduck.CodeAnalysis/Inspections/CodeInspectionType.cs
@@ -4,8 +4,9 @@ public enum CodeInspectionType
     {
         RubberduckOpportunities,
         LanguageOpportunities,
-        MaintainabilityAndReadabilityIssues,
+        NamingAndConventionsIssues,
         CodeQualityIssues,
         Performance,
+        Uncategorized,
     }
 }
diff --git a/Rubberduck.CodeAnalysis/Properties/CodeInspectionDefaults.Designer.cs b/Rubberduck.CodeAnalysis/Properties/CodeInspectionDefaults.Designer.cs
index c6287dcf21..8a159534e8 100644
--- a/Rubberduck.CodeAnalysis/Properties/CodeInspectionDefaults.Designer.cs
+++ b/Rubberduck.CodeAnalysis/Properties/CodeInspectionDefaults.Designer.cs
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Este código fue generado por una herramienta.
+//     Versión de runtime:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si
+//     se vuelve a generar el código.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,7 +12,7 @@ namespace Rubberduck.CodeAnalysis.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     public sealed partial class CodeInspectionDefaults : global::System.Configuration.ApplicationSettingsBase {
         
         private static CodeInspectionDefaults defaultInstance = ((CodeInspectionDefaults)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new CodeInspectionDefaults())));
@@ -28,129 +28,126 @@ public static CodeInspectionDefaults Default {
         [global::System.Configuration.DefaultSettingValueAttribute("<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<CodeInspectionSettings xmlns:xsi=\"http:" +
             "//www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchem" +
             "a\">\r\n  <CodeInspections>\r\n    <CodeInspection Name=\"BooleanAssignedInIfElseInspe" +
-            "ction\" Severity=\"Warning\" InspectionType=\"MaintainabilityAndReadabilityIssues\" /" +
-            ">\r\n    <CodeInspection Name=\"ObsoleteErrorSyntaxInspection\" Severity=\"Suggestion" +
-            "\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"StopKeywo" +
-            "rdInspection\" Severity=\"Suggestion\" InspectionType=\"CodeQualityIssues\" />\r\n    <" +
-            "CodeInspection Name=\"UnhandledOnErrorResumeNextInspection\" Severity=\"Warning\" In" +
-            "spectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"EmptyStringLitera" +
-            "lInspection\" Severity=\"Warning\" InspectionType=\"LanguageOpportunities\" />\r\n    <" +
-            "CodeInspection Name=\"ImplicitByRefModifierInspection\" Severity=\"Hint\" Inspection" +
-            "Type=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"FunctionReturnValueNotUse" +
-            "dInspection\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <Code" +
-            "Inspection Name=\"RedundantByRefModifierInspection\" Severity=\"DoNotShow\" Inspecti" +
-            "onType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"MissingAttributeInspect" +
-            "ion\" Severity=\"Warning\" InspectionType=\"RubberduckOpportunities\" />\r\n    <CodeIn" +
-            "spection Name=\"AttributeOutOfSyncInspection\" Severity=\"Warning\" InspectionType=\"" +
-            "RubberduckOpportunities\" />\r\n    <CodeInspection Name=\"MissingAnnotationArgument" +
-            "Inspection\" Severity=\"Error\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeIns" +
-            "pection Name=\"ModuleScopeDimKeywordInspection\" Severity=\"Suggestion\" InspectionT" +
-            "ype=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"MultilineParameterInsp" +
-            "ection\" Severity=\"Suggestion\" InspectionType=\"MaintainabilityAndReadabilityIssue" +
-            "s\" />\r\n    <CodeInspection Name=\"MultipleDeclarationsInspection\" Severity=\"Warni" +
-            "ng\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeInspection" +
-            " Name=\"ObsoleteCallStatementInspection\" Severity=\"Suggestion\" InspectionType=\"La" +
-            "nguageOpportunities\" />\r\n    <CodeInspection Name=\"ObsoleteCommentSyntaxInspecti" +
-            "on\" Severity=\"Suggestion\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeIn" +
-            "spection Name=\"ObsoleteLetStatementInspection\" Severity=\"Suggestion\" InspectionT" +
-            "ype=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"OptionBaseInspection\" " +
-            "Severity=\"Hint\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <Co" +
-            "deInspection Name=\"RedundantOptionInspection\" Severity=\"Hint\" InspectionType=\"La" +
-            "nguageOpportunities\" />\r\n    <CodeInspection Name=\"OptionExplicitInspection\" Sev" +
-            "erity=\"Error\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"P" +
-            "rocedureCanBeWrittenAsFunctionInspection\" Severity=\"Suggestion\" InspectionType=\"" +
-            "LanguageOpportunities\" />\r\n    <CodeInspection Name=\"ApplicationWorksheetFunctio" +
-            "nInspection\" Severity=\"Suggestion\" InspectionType=\"CodeQualityIssues\" />\r\n    <C" +
-            "odeInspection Name=\"AssignedByValParameterInspection\" Severity=\"Warning\" Inspect" +
-            "ionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"EmptyModuleInspection\"" +
-            " Severity=\"Hint\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <C" +
-            "odeInspection Name=\"LineLabelNotUsedInspection\" Severity=\"Warning\" InspectionTyp" +
-            "e=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"IntegerDataTypeInspection\" S" +
-            "everity=\"Hint\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"" +
-            "ShadowedDeclarationInspection\" Severity=\"DoNotShow\" InspectionType=\"CodeQualityI" +
-            "ssues\" />\r\n    <CodeInspection Name=\"ConstantNotUsedInspection\" Severity=\"Warnin" +
-            "g\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"DefaultProje" +
-            "ctNameInspection\" Severity=\"Suggestion\" InspectionType=\"MaintainabilityAndReadab" +
-            "ilityIssues\" />\r\n    <CodeInspection Name=\"EmptyCaseBlockInspection\" Severity=\"W" +
-            "arning\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeInspec" +
-            "tion Name=\"EmptyDoWhileBlockInspection\" Severity=\"Suggestion\" InspectionType=\"Ma" +
-            "intainabilityAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"EmptyElseBlockI" +
-            "nspection\" Severity=\"Warning\" InspectionType=\"MaintainabilityAndReadabilityIssue" +
-            "s\" />\r\n    <CodeInspection Name=\"EmptyForEachBlockInspection\" Severity=\"Warning\"" +
-            " InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeInspection Na" +
-            "me=\"EmptyForLoopBlockInspection\" Severity=\"Warning\" InspectionType=\"Maintainabil" +
-            "ityAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"EmptyIfBlockInspection\" S" +
-            "everity=\"Warning\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <" +
-            "CodeInspection Name=\"EmptyWhileWendBlockInspection\" Severity=\"Warning\" Inspectio" +
-            "nType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"Encaps" +
-            "ulatePublicFieldInspection\" Severity=\"Suggestion\" InspectionType=\"Maintainabilit" +
-            "yAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"HostSpecificExpressionInspe" +
-            "ction\" Severity=\"Warning\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeIn" +
-            "spection Name=\"HungarianNotationInspection\" Severity=\"Suggestion\" InspectionType" +
-            "=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"ImplicitAct" +
-            "iveSheetReferenceInspection\" Severity=\"Warning\" InspectionType=\"LanguageOpportun" +
-            "ities\" />\r\n    <CodeInspection Name=\"ImplicitActiveWorkbookReferenceInspection\" " +
-            "Severity=\"Warning\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspectio" +
-            "n Name=\"ImplicitDefaultMemberAssignmentInspection\" Severity=\"Suggestion\" Inspect" +
-            "ionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"ImplicitPublicMemb" +
-            "erInspection\" Severity=\"Hint\" InspectionType=\"LanguageOpportunities\" />\r\n    <Co" +
-            "deInspection Name=\"ImplicitVariantReturnTypeInspection\" Severity=\"Hint\" Inspecti" +
-            "onType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"MemberNotOnInterfac" +
-            "eInspection\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <Code" +
-            "Inspection Name=\"MoveFieldCloserToUsageInspection\" Severity=\"Hint\" InspectionTyp" +
-            "e=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"NonReturni" +
-            "ngFunctionInspection\" Severity=\"Error\" InspectionType=\"CodeQualityIssues\" />\r\n  " +
-            "  <CodeInspection Name=\"ObjectVariableNotSetInspection\" Severity=\"Error\" Inspect" +
-            "ionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"ObsoleteGlobalInspecti" +
-            "on\" Severity=\"Suggestion\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeIn" +
-            "spection Name=\"ObsoleteTypeHintInspection\" Severity=\"Suggestion\" InspectionType=" +
-            "\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"ParameterCanBeByValInspect" +
-            "ion\" Severity=\"Suggestion\" InspectionType=\"MaintainabilityAndReadabilityIssues\" " +
-            "/>\r\n    <CodeInspection Name=\"ParameterNotUsedInspection\" Severity=\"Warning\" Ins" +
-            "pectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"ProcedureNotUsedIn" +
-            "spection\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeIns" +
-            "pection Name=\"SelfAssignedDeclarationInspection\" Severity=\"Suggestion\" Inspectio" +
-            "nType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"UnassignedVariableUsageI" +
-            "nspection\" Severity=\"Error\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInsp" +
-            "ection Name=\"UndeclaredVariableInspection\" Severity=\"Error\" InspectionType=\"Code" +
-            "QualityIssues\" />\r\n    <CodeInspection Name=\"UntypedFunctionUsageInspection\" Sev" +
-            "erity=\"Hint\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name" +
-            "=\"UseMeaningfulNameInspection\" Severity=\"Suggestion\" InspectionType=\"Maintainabi" +
-            "lityAndReadabilityIssues\" />\r\n    <CodeInspection Name=\"VariableNotAssignedInspe" +
-            "ction\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspec" +
-            "tion Name=\"VariableNotUsedInspection\" Severity=\"Warning\" InspectionType=\"CodeQua" +
-            "lityIssues\" />\r\n    <CodeInspection Name=\"VariableTypeNotDeclaredInspection\" Sev" +
-            "erity=\"Warning\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection N" +
-            "ame=\"WriteOnlyPropertyInspection\" Severity=\"Suggestion\" InspectionType=\"CodeQual" +
-            "ityIssues\" />\r\n    <CodeInspection Name=\"DefTypeStatementInspection\" Severity=\"S" +
-            "uggestion\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"" +
-            "StepIsNotSpecifiedInspection\" Severity=\"DoNotShow\" InspectionType=\"LanguageOppor" +
-            "tunities\" />\r\n    <CodeInspection Name=\"StepOneIsRedundantInspection\" Severity=\"" +
-            "Hint\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"Sheet" +
-            "AccessedUsingStringInspection\" Severity=\"Suggestion\" InspectionType=\"LanguageOpp" +
-            "ortunities\" />\r\n    <CodeInspection Name=\"ObsoleteMemberUsageInspection\" Severit" +
-            "y=\"Warning\" InspectionType=\"MaintainabilityAndReadabilityIssues\" />\r\n    <CodeIn" +
-            "spection Name=\"ObsoleteCallingConventionInspection\" Severity=\"Warning\" Inspectio" +
-            "nType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"DuplicatedAnnotationInsp" +
-            "ection\" Severity=\"Error\" InspectionType=\"RubberduckOpportunities\" />\r\n    <CodeI" +
-            "nspection Name=\"ModuleWithoutFolderInspection\" Severity=\"Suggestion\" InspectionT" +
-            "ype=\"RubberduckOpportunities\" />\r\n    <CodeInspection Name=\"OnLocalErrorInspecti" +
-            "on\" Severity=\"Suggestion\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeIn" +
-            "spection Name=\"IsMissingOnInappropriateArgumentInspection\" Severity=\"Warning\" In" +
-            "spectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"IsMissingWithNonA" +
-            "rgumentParameterInspection\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues" +
-            "\" />\r\n    <CodeInspection Name=\"AssignmentNotUsedInspection\" Severity=\"Suggestio" +
-            "n\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"UnderscoreIn" +
-            "PublicClassModuleMemberInspection\" Severity=\"Warning\" InspectionType=\"CodeQualit" +
-            "yIssues\" />\r\n    <CodeInspection Name=\"ExcelUdfNameIsValidCellReferenceInspectio" +
+            "ction\" Severity=\"Warning\" InspectionType=\"NamingAndConventionsIssues\" />\r\n    <C" +
+            "odeInspection Name=\"ObsoleteErrorSyntaxInspection\" Severity=\"Suggestion\" Inspect" +
+            "ionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"StopKeywordInspect" +
+            "ion\" Severity=\"Suggestion\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspe" +
+            "ction Name=\"UnhandledOnErrorResumeNextInspection\" Severity=\"Warning\" InspectionT" +
+            "ype=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"EmptyStringLiteralInspecti" +
+            "on\" Severity=\"Warning\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspe" +
+            "ction Name=\"ImplicitByRefModifierInspection\" Severity=\"Hint\" InspectionType=\"Cod" +
+            "eQualityIssues\" />\r\n    <CodeInspection Name=\"FunctionReturnValueNotUsedInspecti" +
+            "on\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspectio" +
+            "n Name=\"RedundantByRefModifierInspection\" Severity=\"DoNotShow\" InspectionType=\"C" +
+            "odeQualityIssues\" />\r\n    <CodeInspection Name=\"MissingAttributeInspection\" Seve" +
+            "rity=\"Warning\" InspectionType=\"RubberduckOpportunities\" />\r\n    <CodeInspection " +
+            "Name=\"AttributeOutOfSyncInspection\" Severity=\"Warning\" InspectionType=\"Rubberduc" +
+            "kOpportunities\" />\r\n    <CodeInspection Name=\"MissingAnnotationArgumentInspectio" +
+            "n\" Severity=\"Error\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection N" +
+            "ame=\"ModuleScopeDimKeywordInspection\" Severity=\"Suggestion\" InspectionType=\"Lang" +
+            "uageOpportunities\" />\r\n    <CodeInspection Name=\"MultilineParameterInspection\" S" +
+            "everity=\"Suggestion\" InspectionType=\"NamingAndConventionsIssues\" />\r\n    <CodeIn" +
+            "spection Name=\"MultipleDeclarationsInspection\" Severity=\"Warning\" InspectionType" +
+            "=\"NamingAndConventionsIssues\" />\r\n    <CodeInspection Name=\"ObsoleteCallStatemen" +
+            "tInspection\" Severity=\"Suggestion\" InspectionType=\"LanguageOpportunities\" />\r\n  " +
+            "  <CodeInspection Name=\"ObsoleteCommentSyntaxInspection\" Severity=\"Suggestion\" I" +
+            "nspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"ObsoleteLetS" +
+            "tatementInspection\" Severity=\"Suggestion\" InspectionType=\"LanguageOpportunities\"" +
+            " />\r\n    <CodeInspection Name=\"OptionBaseInspection\" Severity=\"Hint\" InspectionT" +
+            "ype=\"NamingAndConventionsIssues\" />\r\n    <CodeInspection Name=\"RedundantOptionIn" +
+            "spection\" Severity=\"Hint\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeIn" +
+            "spection Name=\"OptionExplicitInspection\" Severity=\"Error\" InspectionType=\"CodeQu" +
+            "alityIssues\" />\r\n    <CodeInspection Name=\"ProcedureCanBeWrittenAsFunctionInspec" +
+            "tion\" Severity=\"Suggestion\" InspectionType=\"LanguageOpportunities\" />\r\n    <Code" +
+            "Inspection Name=\"ApplicationWorksheetFunctionInspection\" Severity=\"Suggestion\" I" +
+            "nspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"AssignedByValPar" +
+            "ameterInspection\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    " +
+            "<CodeInspection Name=\"EmptyModuleInspection\" Severity=\"Hint\" InspectionType=\"Nam" +
+            "ingAndConventionsIssues\" />\r\n    <CodeInspection Name=\"LineLabelNotUsedInspectio" +
             "n\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection" +
-            " Name=\"EmptyMethodInspection\" Severity=\"Warning\" InspectionType=\"CodeQualityIssu" +
-            "es\" />\r\n    <CodeInspection Name=\"ImplementedInterfaceMemberInspection\" Severity" +
-            "=\"Suggestion\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"P" +
-            "ublicControlFieldAccessInspection\" Severity=\"Hint\" InspectionType=\"LanguageOppor" +
-            "tunities\" />\r\n  </CodeInspections>\r\n  <WhitelistedIdentifiers />\r\n  <RunInspecti" +
-            "onsOnSuccessfulParse>true</RunInspectionsOnSuccessfulParse>\r\n</CodeInspectionSet" +
-            "tings>")]
+            " Name=\"IntegerDataTypeInspection\" Severity=\"Hint\" InspectionType=\"CodeQualityIss" +
+            "ues\" />\r\n    <CodeInspection Name=\"ShadowedDeclarationInspection\" Severity=\"DoNo" +
+            "tShow\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"Constant" +
+            "NotUsedInspection\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n   " +
+            " <CodeInspection Name=\"DefaultProjectNameInspection\" Severity=\"Suggestion\" Inspe" +
+            "ctionType=\"NamingAndConventionsIssues\" />\r\n    <CodeInspection Name=\"EmptyCaseBl" +
+            "ockInspection\" Severity=\"Warning\" InspectionType=\"NamingAndConventionsIssues\" />" +
+            "\r\n    <CodeInspection Name=\"EmptyDoWhileBlockInspection\" Severity=\"Suggestion\" I" +
+            "nspectionType=\"NamingAndConventionsIssues\" />\r\n    <CodeInspection Name=\"EmptyEl" +
+            "seBlockInspection\" Severity=\"Warning\" InspectionType=\"NamingAndConventionsIssues" +
+            "\" />\r\n    <CodeInspection Name=\"EmptyForEachBlockInspection\" Severity=\"Warning\" " +
+            "InspectionType=\"NamingAndConventionsIssues\" />\r\n    <CodeInspection Name=\"EmptyF" +
+            "orLoopBlockInspection\" Severity=\"Warning\" InspectionType=\"NamingAndConventionsIs" +
+            "sues\" />\r\n    <CodeInspection Name=\"EmptyIfBlockInspection\" Severity=\"Warning\" I" +
+            "nspectionType=\"NamingAndConventionsIssues\" />\r\n    <CodeInspection Name=\"EmptyWh" +
+            "ileWendBlockInspection\" Severity=\"Warning\" InspectionType=\"NamingAndConventionsI" +
+            "ssues\" />\r\n    <CodeInspection Name=\"EncapsulatePublicFieldInspection\" Severity=" +
+            "\"Suggestion\" InspectionType=\"NamingAndConventionsIssues\" />\r\n    <CodeInspection" +
+            " Name=\"HostSpecificExpressionInspection\" Severity=\"Warning\" InspectionType=\"Lang" +
+            "uageOpportunities\" />\r\n    <CodeInspection Name=\"HungarianNotationInspection\" Se" +
+            "verity=\"Suggestion\" InspectionType=\"NamingAndConventionsIssues\" />\r\n    <CodeIns" +
+            "pection Name=\"ImplicitActiveSheetReferenceInspection\" Severity=\"Warning\" Inspect" +
+            "ionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"ImplicitActiveWork" +
+            "bookReferenceInspection\" Severity=\"Warning\" InspectionType=\"LanguageOpportunitie" +
+            "s\" />\r\n    <CodeInspection Name=\"ImplicitDefaultMemberAssignmentInspection\" Seve" +
+            "rity=\"Suggestion\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection" +
+            " Name=\"ImplicitPublicMemberInspection\" Severity=\"Hint\" InspectionType=\"LanguageO" +
+            "pportunities\" />\r\n    <CodeInspection Name=\"ImplicitVariantReturnTypeInspection\"" +
+            " Severity=\"Hint\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection " +
+            "Name=\"MemberNotOnInterfaceInspection\" Severity=\"Warning\" InspectionType=\"CodeQua" +
+            "lityIssues\" />\r\n    <CodeInspection Name=\"MoveFieldCloserToUsageInspection\" Seve" +
+            "rity=\"Hint\" InspectionType=\"NamingAndConventionsIssues\" />\r\n    <CodeInspection " +
+            "Name=\"NonReturningFunctionInspection\" Severity=\"Error\" InspectionType=\"CodeQuali" +
+            "tyIssues\" />\r\n    <CodeInspection Name=\"ObjectVariableNotSetInspection\" Severity" +
+            "=\"Error\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"Obsole" +
+            "teGlobalInspection\" Severity=\"Suggestion\" InspectionType=\"LanguageOpportunities\"" +
+            " />\r\n    <CodeInspection Name=\"ObsoleteTypeHintInspection\" Severity=\"Suggestion\"" +
+            " InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"ParameterC" +
+            "anBeByValInspection\" Severity=\"Suggestion\" InspectionType=\"NamingAndConventionsI" +
+            "ssues\" />\r\n    <CodeInspection Name=\"ParameterNotUsedInspection\" Severity=\"Warni" +
+            "ng\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"ProcedureNo" +
+            "tUsedInspection\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <" +
+            "CodeInspection Name=\"SelfAssignedDeclarationInspection\" Severity=\"Suggestion\" In" +
+            "spectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"UnassignedVariabl" +
+            "eUsageInspection\" Severity=\"Error\" InspectionType=\"CodeQualityIssues\" />\r\n    <C" +
+            "odeInspection Name=\"UndeclaredVariableInspection\" Severity=\"Error\" InspectionTyp" +
+            "e=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"UntypedFunctionUsageInspecti" +
+            "on\" Severity=\"Hint\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspecti" +
+            "on Name=\"UseMeaningfulNameInspection\" Severity=\"Suggestion\" InspectionType=\"Nami" +
+            "ngAndConventionsIssues\" />\r\n    <CodeInspection Name=\"VariableNotAssignedInspect" +
+            "ion\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspecti" +
+            "on Name=\"VariableNotUsedInspection\" Severity=\"Warning\" InspectionType=\"CodeQuali" +
+            "tyIssues\" />\r\n    <CodeInspection Name=\"VariableTypeNotDeclaredInspection\" Sever" +
+            "ity=\"Warning\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Nam" +
+            "e=\"WriteOnlyPropertyInspection\" Severity=\"Suggestion\" InspectionType=\"CodeQualit" +
+            "yIssues\" />\r\n    <CodeInspection Name=\"DefTypeStatementInspection\" Severity=\"Sug" +
+            "gestion\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"St" +
+            "epIsNotSpecifiedInspection\" Severity=\"DoNotShow\" InspectionType=\"LanguageOpportu" +
+            "nities\" />\r\n    <CodeInspection Name=\"StepOneIsRedundantInspection\" Severity=\"Hi" +
+            "nt\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Name=\"SheetAc" +
+            "cessedUsingStringInspection\" Severity=\"Suggestion\" InspectionType=\"LanguageOppor" +
+            "tunities\" />\r\n    <CodeInspection Name=\"ObsoleteMemberUsageInspection\" Severity=" +
+            "\"Warning\" InspectionType=\"NamingAndConventionsIssues\" />\r\n    <CodeInspection Na" +
+            "me=\"ObsoleteCallingConventionInspection\" Severity=\"Warning\" InspectionType=\"Code" +
+            "QualityIssues\" />\r\n    <CodeInspection Name=\"DuplicatedAnnotationInspection\" Sev" +
+            "erity=\"Error\" InspectionType=\"RubberduckOpportunities\" />\r\n    <CodeInspection N" +
+            "ame=\"ModuleWithoutFolderInspection\" Severity=\"Suggestion\" InspectionType=\"Rubber" +
+            "duckOpportunities\" />\r\n    <CodeInspection Name=\"OnLocalErrorInspection\" Severit" +
+            "y=\"Suggestion\" InspectionType=\"LanguageOpportunities\" />\r\n    <CodeInspection Na" +
+            "me=\"IsMissingOnInappropriateArgumentInspection\" Severity=\"Warning\" InspectionTyp" +
+            "e=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"IsMissingWithNonArgumentPara" +
+            "meterInspection\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <" +
+            "CodeInspection Name=\"AssignmentNotUsedInspection\" Severity=\"Suggestion\" Inspecti" +
+            "onType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"UnderscoreInPublicClass" +
+            "ModuleMemberInspection\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />" +
+            "\r\n    <CodeInspection Name=\"ExcelUdfNameIsValidCellReferenceInspection\" Severity" +
+            "=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"Empt" +
+            "yMethodInspection\" Severity=\"Warning\" InspectionType=\"CodeQualityIssues\" />\r\n   " +
+            " <CodeInspection Name=\"ImplementedInterfaceMemberInspection\" Severity=\"Suggestio" +
+            "n\" InspectionType=\"CodeQualityIssues\" />\r\n    <CodeInspection Name=\"PublicContro" +
+            "lFieldAccessInspection\" Severity=\"Hint\" InspectionType=\"LanguageOpportunities\" /" +
+            ">\r\n  </CodeInspections>\r\n  <WhitelistedIdentifiers />\r\n  <RunInspectionsOnSucces" +
+            "sfulParse>true</RunInspectionsOnSuccessfulParse>\r\n</CodeInspectionSettings>")]
         public global::Rubberduck.CodeAnalysis.Settings.CodeInspectionSettings CodeInspectionSettings {
             get {
                 return ((global::Rubberduck.CodeAnalysis.Settings.CodeInspectionSettings)(this["CodeInspectionSettings"]));
diff --git a/Rubberduck.CodeAnalysis/Properties/CodeInspectionDefaults.settings b/Rubberduck.CodeAnalysis/Properties/CodeInspectionDefaults.settings
index 922af23e11..2112d95f10 100644
--- a/Rubberduck.CodeAnalysis/Properties/CodeInspectionDefaults.settings
+++ b/Rubberduck.CodeAnalysis/Properties/CodeInspectionDefaults.settings
@@ -6,7 +6,7 @@
       <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;CodeInspectionSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
   &lt;CodeInspections&gt;
-    &lt;CodeInspection Name="BooleanAssignedInIfElseInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
+    &lt;CodeInspection Name="BooleanAssignedInIfElseInspection" Severity="Warning" InspectionType="NamingAndConventionsIssues" /&gt;
     &lt;CodeInspection Name="ObsoleteErrorSyntaxInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="StopKeywordInspection" Severity="Suggestion" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="UnhandledOnErrorResumeNextInspection" Severity="Warning" InspectionType="CodeQualityIssues" /&gt;
@@ -18,52 +18,52 @@
     &lt;CodeInspection Name="AttributeOutOfSyncInspection" Severity="Warning" InspectionType="RubberduckOpportunities" /&gt;
     &lt;CodeInspection Name="MissingAnnotationArgumentInspection" Severity="Error" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="ModuleScopeDimKeywordInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" /&gt;
-    &lt;CodeInspection Name="MultilineParameterInspection" Severity="Suggestion" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
-    &lt;CodeInspection Name="MultipleDeclarationsInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
+    &lt;CodeInspection Name="MultilineParameterInspection" Severity="Suggestion" InspectionType="NamingAndConventionsIssues" /&gt;
+    &lt;CodeInspection Name="MultipleDeclarationsInspection" Severity="Warning" InspectionType="NamingAndConventionsIssues" /&gt;
     &lt;CodeInspection Name="ObsoleteCallStatementInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="ObsoleteCommentSyntaxInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="ObsoleteLetStatementInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" /&gt;
-    &lt;CodeInspection Name="OptionBaseInspection" Severity="Hint" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
+    &lt;CodeInspection Name="OptionBaseInspection" Severity="Hint" InspectionType="NamingAndConventionsIssues" /&gt;
     &lt;CodeInspection Name="RedundantOptionInspection" Severity="Hint" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="OptionExplicitInspection" Severity="Error" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="ProcedureCanBeWrittenAsFunctionInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="ApplicationWorksheetFunctionInspection" Severity="Suggestion" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="AssignedByValParameterInspection" Severity="Warning" InspectionType="CodeQualityIssues" /&gt;
-    &lt;CodeInspection Name="EmptyModuleInspection" Severity="Hint" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
+    &lt;CodeInspection Name="EmptyModuleInspection" Severity="Hint" InspectionType="NamingAndConventionsIssues" /&gt;
     &lt;CodeInspection Name="LineLabelNotUsedInspection" Severity="Warning" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="IntegerDataTypeInspection" Severity="Hint" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="ShadowedDeclarationInspection" Severity="DoNotShow" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="ConstantNotUsedInspection" Severity="Warning" InspectionType="CodeQualityIssues" /&gt;
-    &lt;CodeInspection Name="DefaultProjectNameInspection" Severity="Suggestion" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
-    &lt;CodeInspection Name="EmptyCaseBlockInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
-    &lt;CodeInspection Name="EmptyDoWhileBlockInspection" Severity="Suggestion" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
-    &lt;CodeInspection Name="EmptyElseBlockInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
-    &lt;CodeInspection Name="EmptyForEachBlockInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
-    &lt;CodeInspection Name="EmptyForLoopBlockInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
-    &lt;CodeInspection Name="EmptyIfBlockInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
-    &lt;CodeInspection Name="EmptyWhileWendBlockInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
-    &lt;CodeInspection Name="EncapsulatePublicFieldInspection" Severity="Suggestion" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
+    &lt;CodeInspection Name="DefaultProjectNameInspection" Severity="Suggestion" InspectionType="NamingAndConventionsIssues" /&gt;
+    &lt;CodeInspection Name="EmptyCaseBlockInspection" Severity="Warning" InspectionType="NamingAndConventionsIssues" /&gt;
+    &lt;CodeInspection Name="EmptyDoWhileBlockInspection" Severity="Suggestion" InspectionType="NamingAndConventionsIssues" /&gt;
+    &lt;CodeInspection Name="EmptyElseBlockInspection" Severity="Warning" InspectionType="NamingAndConventionsIssues" /&gt;
+    &lt;CodeInspection Name="EmptyForEachBlockInspection" Severity="Warning" InspectionType="NamingAndConventionsIssues" /&gt;
+    &lt;CodeInspection Name="EmptyForLoopBlockInspection" Severity="Warning" InspectionType="NamingAndConventionsIssues" /&gt;
+    &lt;CodeInspection Name="EmptyIfBlockInspection" Severity="Warning" InspectionType="NamingAndConventionsIssues" /&gt;
+    &lt;CodeInspection Name="EmptyWhileWendBlockInspection" Severity="Warning" InspectionType="NamingAndConventionsIssues" /&gt;
+    &lt;CodeInspection Name="EncapsulatePublicFieldInspection" Severity="Suggestion" InspectionType="NamingAndConventionsIssues" /&gt;
     &lt;CodeInspection Name="HostSpecificExpressionInspection" Severity="Warning" InspectionType="LanguageOpportunities" /&gt;
-    &lt;CodeInspection Name="HungarianNotationInspection" Severity="Suggestion" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
+    &lt;CodeInspection Name="HungarianNotationInspection" Severity="Suggestion" InspectionType="NamingAndConventionsIssues" /&gt;
     &lt;CodeInspection Name="ImplicitActiveSheetReferenceInspection" Severity="Warning" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="ImplicitActiveWorkbookReferenceInspection" Severity="Warning" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="ImplicitDefaultMemberAssignmentInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="ImplicitPublicMemberInspection" Severity="Hint" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="ImplicitVariantReturnTypeInspection" Severity="Hint" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="MemberNotOnInterfaceInspection" Severity="Warning" InspectionType="CodeQualityIssues" /&gt;
-    &lt;CodeInspection Name="MoveFieldCloserToUsageInspection" Severity="Hint" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
+    &lt;CodeInspection Name="MoveFieldCloserToUsageInspection" Severity="Hint" InspectionType="NamingAndConventionsIssues" /&gt;
     &lt;CodeInspection Name="NonReturningFunctionInspection" Severity="Error" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="ObjectVariableNotSetInspection" Severity="Error" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="ObsoleteGlobalInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="ObsoleteTypeHintInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" /&gt;
-    &lt;CodeInspection Name="ParameterCanBeByValInspection" Severity="Suggestion" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
+    &lt;CodeInspection Name="ParameterCanBeByValInspection" Severity="Suggestion" InspectionType="NamingAndConventionsIssues" /&gt;
     &lt;CodeInspection Name="ParameterNotUsedInspection" Severity="Warning" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="ProcedureNotUsedInspection" Severity="Warning" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="SelfAssignedDeclarationInspection" Severity="Suggestion" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="UnassignedVariableUsageInspection" Severity="Error" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="UndeclaredVariableInspection" Severity="Error" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="UntypedFunctionUsageInspection" Severity="Hint" InspectionType="LanguageOpportunities" /&gt;
-    &lt;CodeInspection Name="UseMeaningfulNameInspection" Severity="Suggestion" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
+    &lt;CodeInspection Name="UseMeaningfulNameInspection" Severity="Suggestion" InspectionType="NamingAndConventionsIssues" /&gt;
     &lt;CodeInspection Name="VariableNotAssignedInspection" Severity="Warning" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="VariableNotUsedInspection" Severity="Warning" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="VariableTypeNotDeclaredInspection" Severity="Warning" InspectionType="LanguageOpportunities" /&gt;
@@ -72,7 +72,7 @@
     &lt;CodeInspection Name="StepIsNotSpecifiedInspection" Severity="DoNotShow" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="StepOneIsRedundantInspection" Severity="Hint" InspectionType="LanguageOpportunities" /&gt;
     &lt;CodeInspection Name="SheetAccessedUsingStringInspection" Severity="Suggestion" InspectionType="LanguageOpportunities" /&gt;
-    &lt;CodeInspection Name="ObsoleteMemberUsageInspection" Severity="Warning" InspectionType="MaintainabilityAndReadabilityIssues" /&gt;
+    &lt;CodeInspection Name="ObsoleteMemberUsageInspection" Severity="Warning" InspectionType="NamingAndConventionsIssues" /&gt;
     &lt;CodeInspection Name="ObsoleteCallingConventionInspection" Severity="Warning" InspectionType="CodeQualityIssues" /&gt;
     &lt;CodeInspection Name="DuplicatedAnnotationInspection" Severity="Error" InspectionType="RubberduckOpportunities" /&gt;
     &lt;CodeInspection Name="ModuleWithoutFolderInspection" Severity="Suggestion" InspectionType="RubberduckOpportunities" /&gt;
diff --git a/Rubberduck.CodeAnalysis/app.config b/Rubberduck.CodeAnalysis/app.config
index 09ad657d0a..56c52616a5 100644
--- a/Rubberduck.CodeAnalysis/app.config
+++ b/Rubberduck.CodeAnalysis/app.config
@@ -22,7 +22,7 @@
             xmlns:xsd="http://www.w3.org/2001/XMLSchema">
             <CodeInspections>
               <CodeInspection Name="BooleanAssignedInIfElseInspection" Severity="Warning"
-                InspectionType="MaintainabilityAndReadabilityIssues" />
+                InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="ObsoleteErrorSyntaxInspection" Severity="Suggestion"
                 InspectionType="LanguageOpportunities" />
               <CodeInspection Name="StopKeywordInspection" Severity="Suggestion"
@@ -46,16 +46,16 @@
               <CodeInspection Name="ModuleScopeDimKeywordInspection" Severity="Suggestion"
                 InspectionType="LanguageOpportunities" />
               <CodeInspection Name="MultilineParameterInspection" Severity="Suggestion"
-                InspectionType="MaintainabilityAndReadabilityIssues" />
+                InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="MultipleDeclarationsInspection" Severity="Warning"
-                InspectionType="MaintainabilityAndReadabilityIssues" />
+                InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="ObsoleteCallStatementInspection" Severity="Suggestion"
                 InspectionType="LanguageOpportunities" />
               <CodeInspection Name="ObsoleteCommentSyntaxInspection" Severity="Suggestion"
                 InspectionType="LanguageOpportunities" />
               <CodeInspection Name="ObsoleteLetStatementInspection" Severity="Suggestion"
                 InspectionType="LanguageOpportunities" />
-              <CodeInspection Name="OptionBaseInspection" Severity="Hint" InspectionType="MaintainabilityAndReadabilityIssues" />
+              <CodeInspection Name="OptionBaseInspection" Severity="Hint" InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="RedundantOptionInspection" Severity="Hint"
                 InspectionType="LanguageOpportunities" />
               <CodeInspection Name="OptionExplicitInspection" Severity="Error"
@@ -67,7 +67,7 @@
               <CodeInspection Name="AssignedByValParameterInspection" Severity="Warning"
                 InspectionType="CodeQualityIssues" />
               <CodeInspection Name="EmptyModuleInspection" Severity="Hint"
-                InspectionType="MaintainabilityAndReadabilityIssues" />
+                InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="LineLabelNotUsedInspection" Severity="Warning"
                 InspectionType="CodeQualityIssues" />
               <CodeInspection Name="IntegerDataTypeInspection" Severity="Hint"
@@ -77,27 +77,27 @@
               <CodeInspection Name="ConstantNotUsedInspection" Severity="Warning"
                 InspectionType="CodeQualityIssues" />
               <CodeInspection Name="DefaultProjectNameInspection" Severity="Suggestion"
-                InspectionType="MaintainabilityAndReadabilityIssues" />
+                InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="EmptyCaseBlockInspection" Severity="Warning"
-                InspectionType="MaintainabilityAndReadabilityIssues" />
+                InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="EmptyDoWhileBlockInspection" Severity="Suggestion"
-                InspectionType="MaintainabilityAndReadabilityIssues" />
+                InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="EmptyElseBlockInspection" Severity="Warning"
-                InspectionType="MaintainabilityAndReadabilityIssues" />
+                InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="EmptyForEachBlockInspection" Severity="Warning"
-                InspectionType="MaintainabilityAndReadabilityIssues" />
+                InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="EmptyForLoopBlockInspection" Severity="Warning"
-                InspectionType="MaintainabilityAndReadabilityIssues" />
+                InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="EmptyIfBlockInspection" Severity="Warning"
-                InspectionType="MaintainabilityAndReadabilityIssues" />
+                InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="EmptyWhileWendBlockInspection" Severity="Warning"
-                InspectionType="MaintainabilityAndReadabilityIssues" />
+                InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="EncapsulatePublicFieldInspection" Severity="Suggestion"
-                InspectionType="MaintainabilityAndReadabilityIssues" />
+                InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="HostSpecificExpressionInspection" Severity="Warning"
                 InspectionType="LanguageOpportunities" />
               <CodeInspection Name="HungarianNotationInspection" Severity="Suggestion"
-                InspectionType="MaintainabilityAndReadabilityIssues" />
+                InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="ImplicitActiveSheetReferenceInspection"
                 Severity="Warning" InspectionType="LanguageOpportunities" />
               <CodeInspection Name="ImplicitActiveWorkbookReferenceInspection"
@@ -111,7 +111,7 @@
               <CodeInspection Name="MemberNotOnInterfaceInspection" Severity="Warning"
                 InspectionType="CodeQualityIssues" />
               <CodeInspection Name="MoveFieldCloserToUsageInspection" Severity="Hint"
-                InspectionType="MaintainabilityAndReadabilityIssues" />
+                InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="NonReturningFunctionInspection" Severity="Error"
                 InspectionType="CodeQualityIssues" />
               <CodeInspection Name="ObjectVariableNotSetInspection" Severity="Error"
@@ -121,7 +121,7 @@
               <CodeInspection Name="ObsoleteTypeHintInspection" Severity="Suggestion"
                 InspectionType="LanguageOpportunities" />
               <CodeInspection Name="ParameterCanBeByValInspection" Severity="Suggestion"
-                InspectionType="MaintainabilityAndReadabilityIssues" />
+                InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="ParameterNotUsedInspection" Severity="Warning"
                 InspectionType="CodeQualityIssues" />
               <CodeInspection Name="ProcedureNotUsedInspection" Severity="Warning"
@@ -135,7 +135,7 @@
               <CodeInspection Name="UntypedFunctionUsageInspection" Severity="Hint"
                 InspectionType="LanguageOpportunities" />
               <CodeInspection Name="UseMeaningfulNameInspection" Severity="Suggestion"
-                InspectionType="MaintainabilityAndReadabilityIssues" />
+                InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="VariableNotAssignedInspection" Severity="Warning"
                 InspectionType="CodeQualityIssues" />
               <CodeInspection Name="VariableNotUsedInspection" Severity="Warning"
@@ -153,7 +153,7 @@
               <CodeInspection Name="SheetAccessedUsingStringInspection" Severity="Suggestion"
                 InspectionType="LanguageOpportunities" />
               <CodeInspection Name="ObsoleteMemberUsageInspection" Severity="Warning"
-                InspectionType="MaintainabilityAndReadabilityIssues" />
+                InspectionType="NamingAndConventionsIssues" />
               <CodeInspection Name="ObsoleteCallingConventionInspection" Severity="Warning"
                 InspectionType="CodeQualityIssues" />
               <CodeInspection Name="DuplicatedAnnotationInspection" Severity="Error"
diff --git a/Rubberduck.Deployment/InnoSetup/WorkloadConfigs/Legacy/rubberduck.config b/Rubberduck.Deployment/InnoSetup/WorkloadConfigs/Legacy/rubberduck.config
index 35934ab099..7d2aab02aa 100644
--- a/Rubberduck.Deployment/InnoSetup/WorkloadConfigs/Legacy/rubberduck.config
+++ b/Rubberduck.Deployment/InnoSetup/WorkloadConfigs/Legacy/rubberduck.config
@@ -153,10 +153,10 @@
       <CodeInspection Name="EmptyStringLiteralInspection" Severity="DoNotShow" InspectionType="LanguageOpportunities" />
       <CodeInspection Name="ImplicitPublicMemberInspection" Severity="DoNotShow" InspectionType="LanguageOpportunities" />
       <CodeInspection Name="ObsoleteCallStatementInspection" Severity="DoNotShow" InspectionType="LanguageOpportunities" />
-      <CodeInspection Name="MultipleDeclarationsInspection" Severity="DoNotShow" InspectionType="MaintainabilityAndReadabilityIssues" />
-      <CodeInspection Name="ParameterCanBeByValInspection" Severity="DoNotShow" InspectionType="MaintainabilityAndReadabilityIssues" />
-      <CodeInspection Name="UseMeaningfulNameInspection" Severity="DoNotShow" InspectionType="MaintainabilityAndReadabilityIssues" />
-      <CodeInspection Name="HungarianNotationInspection" Severity="DoNotShow" InspectionType="MaintainabilityAndReadabilityIssues" />
+      <CodeInspection Name="MultipleDeclarationsInspection" Severity="DoNotShow" InspectionType="NamingAndConventionsIssues" />
+      <CodeInspection Name="ParameterCanBeByValInspection" Severity="DoNotShow" InspectionType="NamingAndConventionsIssues" />
+      <CodeInspection Name="UseMeaningfulNameInspection" Severity="DoNotShow" InspectionType="NamingAndConventionsIssues" />
+      <CodeInspection Name="HungarianNotationInspection" Severity="DoNotShow" InspectionType="NamingAndConventionsIssues" />
       <CodeInspection Name="UnreachableCaseInspection" Severity="DoNotShow" InspectionType="CodeQualityIssues" />
       <CodeInspection Name="ImplicitByRefModifierInspection" Severity="DoNotShow" InspectionType="CodeQualityIssues" />
       <CodeInspection Name="ImplicitDefaultMemberAccessInspection" Severity="DoNotShow" InspectionType="CodeQualityIssues" />
diff --git a/Rubberduck.Resources/Inspections/InspectionsUI.Designer.cs b/Rubberduck.Resources/Inspections/InspectionsUI.Designer.cs
index bf3a010bf7..8d134c95b4 100644
--- a/Rubberduck.Resources/Inspections/InspectionsUI.Designer.cs
+++ b/Rubberduck.Resources/Inspections/InspectionsUI.Designer.cs
@@ -99,9 +99,9 @@ public static string CodeInspectionSettings_LanguageOpportunities {
         /// <summary>
         ///   Looks up a localized string similar to Maintainability and Readability Issues.
         /// </summary>
-        public static string CodeInspectionSettings_MaintainabilityAndReadabilityIssues {
+        public static string CodeInspectionSettings_NamingAndConventionsIssues {
             get {
-                return ResourceManager.GetString("CodeInspectionSettings_MaintainabilityAndReadabilityIssues", resourceCulture);
+                return ResourceManager.GetString("CodeInspectionSettings_NamingAndConventionsIssues", resourceCulture);
             }
         }
         
diff --git a/Rubberduck.Resources/Inspections/InspectionsUI.cs.resx b/Rubberduck.Resources/Inspections/InspectionsUI.cs.resx
index 5b7d62ef35..14290c35fa 100644
--- a/Rubberduck.Resources/Inspections/InspectionsUI.cs.resx
+++ b/Rubberduck.Resources/Inspections/InspectionsUI.cs.resx
@@ -150,7 +150,7 @@
   <data name="CodeInspectionSettings_LanguageOpportunities" xml:space="preserve">
     <value>Příležitosti Jazyka</value>
   </data>
-  <data name="CodeInspectionSettings_MaintainabilityAndReadabilityIssues" xml:space="preserve">
+  <data name="CodeInspectionSettings_NamingAndConventionsIssues" xml:space="preserve">
     <value>Problémy Udržovatelnosti a Čitelnosti</value>
   </data>
   <data name="CodeInspectionSettings_RubberduckOpportunities" xml:space="preserve">
diff --git a/Rubberduck.Resources/Inspections/InspectionsUI.de.resx b/Rubberduck.Resources/Inspections/InspectionsUI.de.resx
index c73edfe2be..3782334e69 100644
--- a/Rubberduck.Resources/Inspections/InspectionsUI.de.resx
+++ b/Rubberduck.Resources/Inspections/InspectionsUI.de.resx
@@ -153,7 +153,7 @@
   <data name="CodeInspectionSeverity_DoNotShow" xml:space="preserve">
     <value>Nicht Anzeigen</value>
   </data>
-  <data name="CodeInspectionSettings_MaintainabilityAndReadabilityIssues" xml:space="preserve">
+  <data name="CodeInspectionSettings_NamingAndConventionsIssues" xml:space="preserve">
     <value>Wartbarkeits- und Leserlichkeitsprobleme</value>
   </data>
   <data name="CodeInspectionSeverity_Warning" xml:space="preserve">
diff --git a/Rubberduck.Resources/Inspections/InspectionsUI.es.resx b/Rubberduck.Resources/Inspections/InspectionsUI.es.resx
index c30f96a749..203c121ba5 100644
--- a/Rubberduck.Resources/Inspections/InspectionsUI.es.resx
+++ b/Rubberduck.Resources/Inspections/InspectionsUI.es.resx
@@ -150,7 +150,7 @@
   <data name="CodeInspectionSettings_LanguageOpportunities" xml:space="preserve">
     <value>Oportunidades de lenguaje</value>
   </data>
-  <data name="CodeInspectionSettings_MaintainabilityAndReadabilityIssues" xml:space="preserve">
+  <data name="CodeInspectionSettings_NamingAndConventionsIssues" xml:space="preserve">
     <value>Problemas de mantenibilidad y legibilidad</value>
   </data>
   <data name="CodeInspectionSettings_Performance" xml:space="preserve">
diff --git a/Rubberduck.Resources/Inspections/InspectionsUI.fr.resx b/Rubberduck.Resources/Inspections/InspectionsUI.fr.resx
index 59d4dfe8ea..524d776a2f 100644
--- a/Rubberduck.Resources/Inspections/InspectionsUI.fr.resx
+++ b/Rubberduck.Resources/Inspections/InspectionsUI.fr.resx
@@ -147,7 +147,7 @@
   <data name="CodeInspectionSeverity_DoNotShow" xml:space="preserve">
     <value>Ne pas afficher</value>
   </data>
-  <data name="CodeInspectionSettings_MaintainabilityAndReadabilityIssues" xml:space="preserve">
+  <data name="CodeInspectionSettings_NamingAndConventionsIssues" xml:space="preserve">
     <value>Lecture et facilité d'entretient</value>
   </data>
   <data name="CodeInspectionSeverity_Warning" xml:space="preserve">
diff --git a/Rubberduck.Resources/Inspections/InspectionsUI.it.resx b/Rubberduck.Resources/Inspections/InspectionsUI.it.resx
index 6e6a973cb9..7b42b9df20 100644
--- a/Rubberduck.Resources/Inspections/InspectionsUI.it.resx
+++ b/Rubberduck.Resources/Inspections/InspectionsUI.it.resx
@@ -156,7 +156,7 @@
   <data name="CodeInspectionSettings_LanguageOpportunities" xml:space="preserve">
     <value>Opportunità del linguaggio</value>
   </data>
-  <data name="CodeInspectionSettings_MaintainabilityAndReadabilityIssues" xml:space="preserve">
+  <data name="CodeInspectionSettings_NamingAndConventionsIssues" xml:space="preserve">
     <value>Problemi di manutenibilità e leggibilità</value>
   </data>
   <data name="CodeInspectionSettings_Performance" xml:space="preserve">
diff --git a/Rubberduck.Resources/Inspections/InspectionsUI.resx b/Rubberduck.Resources/Inspections/InspectionsUI.resx
index 73d1c8ca9f..84faeedfde 100644
--- a/Rubberduck.Resources/Inspections/InspectionsUI.resx
+++ b/Rubberduck.Resources/Inspections/InspectionsUI.resx
@@ -150,7 +150,7 @@
   <data name="CodeInspectionSettings_LanguageOpportunities" xml:space="preserve">
     <value>Language Opportunities</value>
   </data>
-  <data name="CodeInspectionSettings_MaintainabilityAndReadabilityIssues" xml:space="preserve">
+  <data name="CodeInspectionSettings_NamingAndConventionsIssues" xml:space="preserve">
     <value>Maintainability and Readability Issues</value>
   </data>
   <data name="CodeInspectionSettings_Performance" xml:space="preserve">
diff --git a/RubberduckTests/Settings/InspectionSettingsTests.cs b/RubberduckTests/Settings/InspectionSettingsTests.cs
index 4f6fae5afa..5bc3d8fd8c 100644
--- a/RubberduckTests/Settings/InspectionSettingsTests.cs
+++ b/RubberduckTests/Settings/InspectionSettingsTests.cs
@@ -19,7 +19,7 @@ private Configuration GetDefaultConfig()
                 {
                     new CodeInspectionSetting("DoNotShowInspection", "Do not show me", CodeInspectionType.LanguageOpportunities, CodeInspectionSeverity.DoNotShow),
                     new CodeInspectionSetting("HintInspection", "I'm a hint", CodeInspectionType.LanguageOpportunities, CodeInspectionSeverity.Hint),
-                    new CodeInspectionSetting("SuggestionInspection", "I'm a suggestion", CodeInspectionType.MaintainabilityAndReadabilityIssues, CodeInspectionSeverity.Suggestion),
+                    new CodeInspectionSetting("SuggestionInspection", "I'm a suggestion", CodeInspectionType.NamingAndConventionsIssues, CodeInspectionSeverity.Suggestion),
                     new CodeInspectionSetting("WarningInspection", "I'm a warning", CodeInspectionType.CodeQualityIssues),
                     new CodeInspectionSetting("NondefaultSeverityInspection", "I do not have my original severity", CodeInspectionType.LanguageOpportunities,CodeInspectionSeverity.DoNotShow),
                     new CodeInspectionSetting("ErrorInspection", "FIX ME!", CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Error)
@@ -39,7 +39,7 @@ private Configuration GetNondefaultConfig()
                 {
                     new CodeInspectionSetting("DoNotShowInspection", "Do not show me", CodeInspectionType.LanguageOpportunities),
                     new CodeInspectionSetting("HintInspection", "I'm a hint", CodeInspectionType.LanguageOpportunities, CodeInspectionSeverity.Suggestion),
-                    new CodeInspectionSetting("SuggestionInspection", "I'm a suggestion", CodeInspectionType.MaintainabilityAndReadabilityIssues, CodeInspectionSeverity.Hint),
+                    new CodeInspectionSetting("SuggestionInspection", "I'm a suggestion", CodeInspectionType.NamingAndConventionsIssues, CodeInspectionSeverity.Hint),
                     new CodeInspectionSetting("WarningInspection", "I'm a warning", CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.Error),
                     new CodeInspectionSetting("NondefaultSeverityInspection", "I do not have my original severity", CodeInspectionType.LanguageOpportunities, CodeInspectionSeverity.Error),
                     new CodeInspectionSetting("ErrorInspection", "FIX ME!", CodeInspectionType.CodeQualityIssues, CodeInspectionSeverity.DoNotShow)