diff --git a/applications/utilities/mesh/generation/blockMesh/Make/files b/applications/utilities/mesh/generation/blockMesh/Make/files
index af92bf759cdc04732bd0f854903f671f19db5a48..81f5f3674918295d0a0f8c5c2fcc141e089886e1 100644
--- a/applications/utilities/mesh/generation/blockMesh/Make/files
+++ b/applications/utilities/mesh/generation/blockMesh/Make/files
@@ -26,6 +26,6 @@ blockPoints.C
 blockCells.C
 blockBoundary.C
 
-genBlockMesh.C
+blockMeshApp.C
 
 EXE = $(FOAM_APPBIN)/blockMesh
diff --git a/doc/Doxygen/tools/README b/doc/Doxygen/tools/README
index 136ca55443f4556b3bf51fcb2b60c019d653dd95..86c4e8ae734d2080c5ac23d0fed4c7130236bbcd 100644
--- a/doc/Doxygen/tools/README
+++ b/doc/Doxygen/tools/README
@@ -12,5 +12,4 @@ Misc Tools
 2.  find-its
 3.  find-junkFiles
 4.  find-longlines
-5.  find-debugNames (requires git)
 
diff --git a/doc/Doxygen/tools/find-debugNames b/doc/Doxygen/tools/find-debugNames
deleted file mode 100755
index 38b4f80d79d8f92779625dc24cdeecab24fb8b70..0000000000000000000000000000000000000000
--- a/doc/Doxygen/tools/find-debugNames
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-
-# -----------------------------------------------------------------------------
-#
-# Script
-#     find-debugNames
-#
-# Description
-#     Use git-grep to find these macros.
-#
-#         defineTypeNameAndDebug
-#         defineTemplateTypeNameAndDebugWithName
-#         defineTemplateTypeNameAndDebug
-#         defineNamedTemplateTypeNameAndDebug
-#
-#     print sorted list
-#
-# Note
-#     will miss debug switches that are defined usign two defines
-# -----------------------------------------------------------------------------
-
-$ENV{WM_PROJECT_DIR} and chdir "$ENV{WM_PROJECT_DIR}"
-  or die "cannot change to OpenFOAM dir\n";
-
-local @ARGV =
-q{git-grep -e 'define\(Named\)*\(Template\)*TypeNameAndDebug\(WithName\)*' src applications |};
-
-# parse stuff that looks like this:
-# ODE/ODESolvers/KRR4/KRR4.C:defineTypeNameAndDebug(Foam::KRR4, 0);
-
-my %debug;
-
-while (<>) {
-    /#/ and next;    # avoid defines
-    if (s{,\s*(\d+)\s*\)\s*\;\s*$}{})    # get value and chop end
-    {
-        my $v = $1;
-        s{\s*,.*$}{};                    # remove all trailing info
-        s{^(.+?):(.+?)\(\s*(Foam::)?}{} or next;    # get file and chop begin
-
-        my $file = $1;
-        my $k    = $_;
-
-        $debug{$k} = [ $v, $file ];
-    }
-}
-
-print "DebugSwitches\n{\n";
-
-for my $k ( sort keys %debug ) {
-    my ( $v, $file ) = @{ $debug{$k} };
-    my $pad = ( 20 - length $k );
-    while ( $pad <= 1 ) {
-        $pad += 4;
-    }
-    $pad = ' ' x $pad;
-
-    print "    $k$pad$v;    // $file\n";
-}
-
-print "}\n";
diff --git a/etc/controlDict b/etc/controlDict
index cb03f106d695e0b6278eacb8b1d4f1d3640f6006..2cf2ce334aa2cd0eb35f458097263ae8741d56ed 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -57,8 +57,8 @@ DebugSwitches
     C8H18               0;
     C9H20               0;
     CH3OH               0;
-    CallbackRegistryName    0;
-    CarnahanStarlingRadial  0;
+    CallbackRegistry    0;
+    CarnahanStarling    0;
     ChomiakInjector     0;
     Cloud<indexedParticle>  0;
     Cloud<kinematicParcel>  0;
@@ -208,7 +208,7 @@ DebugSwitches
     SIBS                0;
     SKA                 0;
     SLTS                0;
-    STARCDCoordinateRotation    0;
+    STARCDRotation      0;
     Schaeffer           0;
     SchillerNaumann     0;
     SinclairJackson     0;
@@ -781,7 +781,6 @@ DebugSwitches
     volVectorField      0;
     volVectorField::DimensionedInternalField 0;
     vtk                 0;
-    vtkPV3Foam          0;
     walkPatch           0;
     wall                0;
     wallHeatTransfer    0;