diff --git a/include/internal/TestCPPTestCase.h b/include/internal/TestCPPTestCase.h
index e425b53..1a5326c 100644
--- a/include/internal/TestCPPTestCase.h
+++ b/include/internal/TestCPPTestCase.h
@@ -129,8 +129,8 @@ namespace TestCPP {
          *      string.
          */
         TestCase (
-            TestObjName&& testName,
-            function<void()> test,
+            TestObjName&& name,
+            function<void()> testFn,
             bool testPassedMessage = true,
             bool captureOut = false,
             bool captureLog = false,
@@ -289,14 +289,14 @@ namespace TestCPP {
          * @param out The stream to write the test failure reason to.
          * @param reason The test failure reason to write.
          */
-        void logFailure (ostream& out, const string& reason) const;
+        void logFailure (ostream& out, const string& failureReason) const;
         /**
          * @brief If a test encounters an error while running, this
          *          function will be called to log the test error.
          * @param failureMessage The error message from the test that
          *          should be logged.
          */
-        void logTestFailure (const string& failureMessage);
+        void logTestFailure (const string& failureReason);
         /**
          * @brief Internal test run controller.
          */
diff --git a/src/TestCPPTestCase.cpp b/src/TestCPPTestCase.cpp
index 46e3c11..d13f0c5 100644
--- a/src/TestCPPTestCase.cpp
+++ b/src/TestCPPTestCase.cpp
@@ -113,12 +113,12 @@ namespace TestCPP {
 
     TestCase::TestCase (TestObjName&& name,
                         function<void()> testFn,
-                        bool msg,
+                        bool testPassedMessage,
                         bool captureOut, bool captureLog,
                         bool captureErr,
                         TestCase::TestCaseOutCompareOptions opt)
     {
-        this->notifyTestPassed = msg;
+        this->notifyTestPassed = testPassedMessage;
         this->test = testFn;
 
         this->testName = name;
@@ -291,7 +291,7 @@ namespace TestCPP {
         return this->lastRunTime;
     }
 
-    void TestCase::logFailure(ostream& out, const string& reason) const {
+    void TestCase::logFailure(ostream& out, const string& failureReason) const {
         out << fixed;
         out << setprecision(TCPPNum::TIME_PRECISION);
         out << TCPPStr::TEST << this->testName << TCPPStr::FAIL
@@ -300,10 +300,10 @@ namespace TestCPP {
                TCPPNum::NANOS_IN_SEC
             << TCPPStr::SEC << TCPPStr::PARENR
             << endl;
-        out << TCPPStr::REASON_ << reason << endl;
+        out << TCPPStr::REASON_ << failureReason << endl;
     }
 
-    void TestCase::logTestFailure (const string& reason) {
+    void TestCase::logTestFailure (const string& failureReason) {
         unique_ptr<ostream> logStream = nullptr;
 
         if (this->clogOriginal.get() != nullptr) {
@@ -315,14 +315,14 @@ namespace TestCPP {
             logStream = unique_ptr<ostream>(&clog);
         }
 
-        logFailure(*logStream, reason);
+        logFailure(*logStream, failureReason);
 
         if (this->clogOriginal.get() != nullptr) {
             logStream->flush();
 
             // If someone is looking for something in the message,
             //  and it's captured, make sure it's there.
-            logFailure(clog, reason);
+            logFailure(clog, failureReason);
         }
 
         logStream.release();
@@ -370,8 +370,8 @@ namespace TestCPP {
         return false;
     }
 
-    void TestCase::setNotifyPassed (bool notify) {
-        this->notifyTestPassed = notify;
+    void TestCase::setNotifyPassed (bool shouldNotify) {
+        this->notifyTestPassed = shouldNotify;
     }
 
     void TestCase::captureStdout () {