diff --git a/bin/codestyle/check_codestyle.sh b/bin/codestyle/check_codestyle.sh
index 662f7f1..f2ac455 100755
--- a/bin/codestyle/check_codestyle.sh
+++ b/bin/codestyle/check_codestyle.sh
@@ -12,19 +12,19 @@ while getopts ":s" flag; do
   esac
 done
 
-echo 'isort: `isort -rc --check-only --settings-path ./setup.cfg`'
+echo 'isort -rc --check-only --settings-path ./setup.cfg'
 isort -rc --check-only --settings-path ./setup.cfg
 
 # stop the build if there are any unexpected flake8 issues
-echo 'flake8: `bash ./bin/_flake8.sh`'
-bash ./bin/_flake8.sh --count \
+echo 'bash ./bin/codestyle/flake8.sh'
+bash ./bin/codestyle/flake8.sh --count \
   --config=./setup.cfg \
   --show-source \
   --statistics
 
 # exit-zero treats all errors as warnings.
-echo 'flake8 (warnings): `flake8 .`'
-flake8 ./bin/_flake8.sh --count \
+echo 'flake8'
+flake8 ./bin/codestyle/flake8.sh --count \
   --config=./setup.cfg \
   --max-complexity=10 \
   --show-source \
@@ -33,9 +33,9 @@ flake8 ./bin/_flake8.sh --count \
 
 # test to make sure the code is yapf compliant
 if [[ -f ${skip_inplace} ]]; then
-  echo 'yapf: `bash ./bin/_yapf.sh --all`'
-  bash ./bin/_yapf.sh --all
+  echo 'bash ./bin/codestyle/yapf.sh --all'
+  bash ./bin/codestyle/yapf.sh --all
 else
-  echo 'yapf: `bash ./bin/_yapf.sh --all-in-place`'
-  bash ./bin/_yapf.sh --all-in-place
+  echo 'bash ./bin/codestyle/yapf.sh --all-in-place'
+  bash ./bin/codestyle/yapf.sh --all-in-place
 fi
diff --git a/teamcity/binary.sh b/teamcity/binary.sh
index bf75458..a3617a7 100644
--- a/teamcity/binary.sh
+++ b/teamcity/binary.sh
@@ -5,4 +5,4 @@ set -eo pipefail -v
 
 pip install -r requirements/requirements.txt
 
-bash ./bin/tests/_check_binary.sh
+bash ./bin/tests/check_binary.sh
diff --git a/teamcity/instance.sh b/teamcity/instance.sh
index f414784..c1b2466 100644
--- a/teamcity/instance.sh
+++ b/teamcity/instance.sh
@@ -5,4 +5,4 @@ set -eo pipefail -v
 
 pip install -r requirements/requirements.txt
 
-bash ./bin/tests/_check_instance.sh
+bash ./bin/tests/check_instance.sh
diff --git a/teamcity/semantic.sh b/teamcity/semantic.sh
index 794e0f2..b1bf33c 100644
--- a/teamcity/semantic.sh
+++ b/teamcity/semantic.sh
@@ -5,4 +5,4 @@ set -eo pipefail -v
 
 pip install -r requirements/requirements.txt
 
-bash ./bin/tests/_check_semantic.sh
+bash ./bin/tests/check_semantic.sh