diff --git a/.gitignore b/.gitignore
index e5eeb66d..b245dd3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -204,4 +204,4 @@ python/peacock/tests/postprocessor_tab/TestPostprocessorPluginManager_test_scrip
 !python/peacock/tests/**/input/*.*
 
 build
-blackbear.yaml
+black_bear.yaml
diff --git a/Makefile b/Makefile
index 81baf2f2..cf40cc02 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ BLACKBEAR_DIR      := $(CURDIR)
 
 # dep apps
 APPLICATION_DIR    := $(CURDIR)
-APPLICATION_NAME   := blackbear
+APPLICATION_NAME   := black_bear
 BUILD_EXEC         := yes
 DEP_APPS           := $(shell $(FRAMEWORK_DIR)/scripts/find_dep_apps.py $(APPLICATION_NAME))
 include            $(FRAMEWORK_DIR)/app.mk
diff --git a/blackbear.mk b/black_bear.mk
similarity index 100%
rename from blackbear.mk
rename to black_bear.mk
diff --git a/contrib/neml.mk b/contrib/neml.mk
index 42bbd081..709ef63b 100644
--- a/contrib/neml.mk
+++ b/contrib/neml.mk
@@ -10,7 +10,7 @@ neml_LIB            := $(NEML_DIR)/libneml-$(METHOD).la
 neml_includes       := $(NEML_DIR)/include
 neml_dep_includes   := -iquote$(NEML_DIR)/rapidxml -iquote$(BLACKBEAR_DIR)/contrib/neml_extra_include
 
-$(APPLICATION_DIR)/lib/libblackbear-$(METHOD).la: $(neml_LIB)
+$(APPLICATION_DIR)/lib/libblack_bear-$(METHOD).la: $(neml_LIB)
 
 $(neml_LIB): $(neml_objects)
 	@echo "Linking Library "$@"..."
diff --git a/run_tests b/run_tests
index f841304b..6f90cc3f 100755
--- a/run_tests
+++ b/run_tests
@@ -9,4 +9,4 @@ MOOSE_DIR = os.environ.get('MOOSE_DIR', MOOSE_DIR)
 sys.path.append(os.path.join(MOOSE_DIR, 'python'))
 
 from TestHarness import TestHarness
-TestHarness.buildAndRun(sys.argv, 'blackbear', MOOSE_DIR)
+TestHarness.buildAndRun(sys.argv, 'black_bear', MOOSE_DIR)
diff --git a/src/base/BlackBearApp.C b/src/base/BlackBearApp.C
index 13ef0c9f..8235ff31 100644
--- a/src/base/BlackBearApp.C
+++ b/src/base/BlackBearApp.C
@@ -47,7 +47,7 @@ BlackBearApp::runInputFile()
 }
 
 static void
-associateSyntaxInner(Syntax & syntax, ActionFactory & /*action_factory*/)
+associateSyntaxInner(Syntax & /*syntax*/, ActionFactory & /*action_factory*/)
 {
 }