diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 8e364dc39..c4fe91fe2 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -277,7 +277,7 @@ void Event::AddFrame( struct timeval timestamp, const Image *image, unsigned int
 		}
 	}
 
-	if ( (bool)config.Item( ZM_RECORD_CHECK_IMAGES ) )
+	if ( (bool)config.Item( ZM_RECORD_DIAG_IMAGES ) )
 	{
 		char diag_glob[PATH_MAX] = "";
 
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index dc0b27a7e..b9f7e9022 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -1140,7 +1140,7 @@ unsigned int Monitor::Compare( const Image &comp_image )
 
 	if ( n_zones <= 0 ) return( alarm );
 
-	if (  (bool)config.Item( ZM_RECORD_CHECK_IMAGES ) )
+	if (  (bool)config.Item( ZM_RECORD_DIAG_IMAGES ) )
 	{
 		static char diag_path[PATH_MAX] = "";
 		if ( !diag_path[0] )
@@ -1152,7 +1152,7 @@ unsigned int Monitor::Compare( const Image &comp_image )
 
 	Image *delta_image = ref_image.Delta( comp_image );
 
-	if (  (bool)config.Item( ZM_RECORD_CHECK_IMAGES ) )
+	if (  (bool)config.Item( ZM_RECORD_DIAG_IMAGES ) )
 	{
 		static char diag_path[PATH_MAX] = "";
 		if ( !diag_path[0] )
diff --git a/src/zm_zone.cpp b/src/zm_zone.cpp
index 70c366d2a..26141f084 100644
--- a/src/zm_zone.cpp
+++ b/src/zm_zone.cpp
@@ -105,7 +105,7 @@ bool Zone::CheckAlarms( const Image *delta_image )
 			*pdiff = BLACK;
 		}
 	}
-	if (  (bool)config.Item( ZM_RECORD_CHECK_IMAGES ) )
+	if (  (bool)config.Item( ZM_RECORD_DIAG_IMAGES ) )
 	{
 		static char diag_path[PATH_MAX] = "";
 		if ( !diag_path[0] )
@@ -174,7 +174,7 @@ bool Zone::CheckAlarms( const Image *delta_image )
 			}
 		}
 	}
-	if (  (bool)config.Item( ZM_RECORD_CHECK_IMAGES ) )
+	if (  (bool)config.Item( ZM_RECORD_DIAG_IMAGES ) )
 	{
 		static char diag_path[PATH_MAX] = "";
 		if ( !diag_path[0] )
@@ -321,7 +321,7 @@ bool Zone::CheckAlarms( const Image *delta_image )
 			}
 		}
 	}
-	if (  (bool)config.Item( ZM_RECORD_CHECK_IMAGES ) )
+	if (  (bool)config.Item( ZM_RECORD_DIAG_IMAGES ) )
 	{
 		static char diag_path[PATH_MAX] = "";
 		if ( !diag_path[0] )
@@ -373,7 +373,7 @@ bool Zone::CheckAlarms( const Image *delta_image )
 			}
 		}
 	}
-	if (  (bool)config.Item( ZM_RECORD_CHECK_IMAGES ) )
+	if (  (bool)config.Item( ZM_RECORD_DIAG_IMAGES ) )
 	{
 		static char diag_path[PATH_MAX] = "";
 		if ( !diag_path[0] )
diff --git a/zmconfig.pl.in b/zmconfig.pl.in
index 3a9c12edc..3e18a3b12 100755
--- a/zmconfig.pl.in
+++ b/zmconfig.pl.in
@@ -788,10 +788,10 @@ my @options =
 		category => 'system',
 	},
 	{
-		name => "ZM_RECORD_CHECK_IMAGES",
+		name => "ZM_RECORD_DIAG_IMAGES",
 		default => "no",
-		description => "Whether to record intermediate alarm check images, can be very slow",
-		help => "In addition to recording event statistics you can now also record the intermediate images that display the results of the various checks and processing that occur when trying to determine if an alarm event has taken place. There are up to four of these images generated for each zone for each alarm or alert frame so this can have a massive impact on performance. Only switch this setting on for debug or analysis purposes and remember to switch it off again once no longer required.",
+		description => "Whether to record intermediate alarm diagnostic images, can be very slow",
+		help => "In addition to recording event statistics you can also record the intermediate diagnostic images that display the results of the various checks and processing that occur when trying to determine if an alarm event has taken place. There are several of these images generated for each frame and zone for each alarm or alert frame so this can have a massive impact on performance. Only switch this setting on for debug or analysis purposes and remember to switch it off again once no longer required.",
 		type => $types{boolean},
 		category => 'system',
 	},