diff --git a/ikasaneip/cli/shell/jar/src/main/java/org/ikasan/cli/shell/command/ActionCommand.java b/ikasaneip/cli/shell/jar/src/main/java/org/ikasan/cli/shell/command/ActionCommand.java
index 4e90fdea23..bc4d4510e8 100644
--- a/ikasaneip/cli/shell/jar/src/main/java/org/ikasan/cli/shell/command/ActionCommand.java
+++ b/ikasaneip/cli/shell/jar/src/main/java/org/ikasan/cli/shell/command/ActionCommand.java
@@ -55,7 +55,7 @@
  */
 public abstract class ActionCommand extends AbstractCommand
 {
-    @Value("${command.stop.process.wait.timeout.seconds:300}")
+    @Value("${ikasan.shell.command.stop.process.wait.timeout.seconds:300}")
     int commandStopProcessWaitTimeoutSeconds = 300;
 
     ProcessType processType = getProcessType();
diff --git a/ikasaneip/cli/shell/jar/src/main/java/org/ikasan/cli/shell/command/SolrCommand.java b/ikasaneip/cli/shell/jar/src/main/java/org/ikasan/cli/shell/command/SolrCommand.java
index 8d95fe6a63..78b2018212 100644
--- a/ikasaneip/cli/shell/jar/src/main/java/org/ikasan/cli/shell/command/SolrCommand.java
+++ b/ikasaneip/cli/shell/jar/src/main/java/org/ikasan/cli/shell/command/SolrCommand.java
@@ -194,8 +194,8 @@ JSONObject stop(ProcessType processType, String name, String username, String co
                 logger.error("Error occurred while waiting for process shutdown", e);
                 throw new RuntimeException(String.format("An error has occurred waiting for the Solr process to shutdown. " +
                     " This is likely to be a timout waiting for the process to end. The timeout is currently configured to " +
-                    "[%s] seconds. This can be adjusted by setting command.stop.process.wait.timeout.seconds in the application" +
-                    " properties.", super.commandStopProcessWaitTimeoutSeconds)
+                    "[%s] seconds. This can be adjusted by setting `ikasan.shell.command.stop.process.wait.timeout.seconds` " +
+                    "in the application properties.", super.commandStopProcessWaitTimeoutSeconds)
                     , e);
             }
         }
diff --git a/ikasaneip/cli/shell/jar/src/main/java/org/ikasan/cli/shell/operation/DefaultOperationImpl.java b/ikasaneip/cli/shell/jar/src/main/java/org/ikasan/cli/shell/operation/DefaultOperationImpl.java
index cb5d2c38f2..69c09e4dbb 100644
--- a/ikasaneip/cli/shell/jar/src/main/java/org/ikasan/cli/shell/operation/DefaultOperationImpl.java
+++ b/ikasaneip/cli/shell/jar/src/main/java/org/ikasan/cli/shell/operation/DefaultOperationImpl.java
@@ -283,8 +283,8 @@ public void stop(ProcessType processType, String name, String username, int shut
                 logger.error("Error occurred while waiting for process shutdown", e);
                 throw new RuntimeException(String.format("An error has occurred waiting for the process to shutdown. " +
                     " This is likely to be a timout waiting for the process to end. The timeout is currently configured to " +
-                    "[%s] seconds. This can be adjusted by setting command.stop.process.wait.timeout.seconds in the application" +
-                    " properties.", shutdownTimeoutSeconds)
+                    "[%s] seconds. This can be adjusted by setting `ikasan.shell.command.stop.process.wait.timeout.seconds` " +
+                    "in the application properties.", shutdownTimeoutSeconds)
                     , e);
             }
         }
diff --git a/ikasaneip/cli/shell/sql/migration/liquibase-changelog-contents.sql b/ikasaneip/cli/shell/sql/migration/liquibase-changelog-contents.sql
index c711a6db64..8975271828 100644
--- a/ikasaneip/cli/shell/sql/migration/liquibase-changelog-contents.sql
+++ b/ikasaneip/cli/shell/sql/migration/liquibase-changelog-contents.sql
@@ -6,7 +6,8 @@ UPDATE "PUBLIC"."DATABASECHANGELOG" SET MD5SUM = '9:aa12b44c16348f5122e5853952c3
 UPDATE "PUBLIC"."DATABASECHANGELOG" SET MD5SUM = '9:5d5b849202096ec3d8ded4f3b5612d2f' WHERE ID = 'alterFlowInvocationMetricTimestamp';
 UPDATE "PUBLIC"."DATABASECHANGELOG" SET MD5SUM = '9:4819ac97e0c7fee7682547cbde1b446d' WHERE ID = 'alterIkasanWiretapAddHarvestedTimestamp';
 UPDATE "PUBLIC"."DATABASECHANGELOG" SET MD5SUM = '9:805d9fe447e260506871d732011cf698' WHERE ID = 'alterReplayEventAddHarvestedTimestamp';
-UPDATE "PUBLIC"."DATABASECHANGELOG" SET MD5SUM = '9:20dfec38b41ab634480f2cb767f96f7e' WHERE ID = 'alterReplayEventAddHarvestedTimestamp';
+UPDATE "PUBLIC"."DATABASECHANGELOG" SET MD5SUM = '9:20dfec38b41ab634480f2cb767f96f7e' WHERE ID = 'alterSystemEventAddHarvested';
+UPDATE "PUBLIC"."DATABASECHANGELOG" SET MD5SUM = '9:b72df056bd167952c45ac0995343b1b6' WHERE ID = 'alterSystemEventAddHarvestedTimestamp';
 
 -- File Transfer Ikasan changelog MD5SUM updates
 UPDATE "PUBLIC"."DATABASECHANGELOG" SET MD5SUM = '9:5d66a8a680dd49ed528b81ad5edec84e' WHERE ID = 'createFTChecksumCommand';