diff --git a/pkg/httpserver/httpserver_test.go b/pkg/httpserver/httpserver_test.go
index 333509c..89b279e 100644
--- a/pkg/httpserver/httpserver_test.go
+++ b/pkg/httpserver/httpserver_test.go
@@ -117,7 +117,7 @@ func TestMissingCAFile(t *testing.T) {
 	InitCORSConfig(cc)
 	cp.Set(HTTPConfTLSCAFile, "badness")
 	_, err := NewHTTPServer(context.Background(), "ut", mux.NewRouter(), make(chan error), cp, cc)
-	assert.Regexp(t, "FF10153", err)
+	assert.Regexp(t, "FF00153", err)
 }
 
 func TestBadCAFile(t *testing.T) {
@@ -127,7 +127,7 @@ func TestBadCAFile(t *testing.T) {
 	InitCORSConfig(cc)
 	cp.Set(HTTPConfTLSCAFile, configDir+"/firefly.common.yaml")
 	_, err := NewHTTPServer(context.Background(), "ut", mux.NewRouter(), make(chan error), cp, cc)
-	assert.Regexp(t, "FF10152", err)
+	assert.Regexp(t, "FF00152", err)
 }
 
 func TestTLSServerSelfSignedWithClientAuth(t *testing.T) {
diff --git a/pkg/i18n/en_base_error_messages.go b/pkg/i18n/en_base_error_messages.go
index b2433f1..94486de 100644
--- a/pkg/i18n/en_base_error_messages.go
+++ b/pkg/i18n/en_base_error_messages.go
@@ -76,8 +76,8 @@ var (
 	MsgWSConnectFailed            = FFE("FF00148", "Websocket connect failed")
 	MsgInvalidURL                 = FFE("FF00149", "Invalid URL: '%s'")
 	MsgWSHeartbeatTimeout         = FFE("FF00150", "Websocket heartbeat timed out after %.2fms", 500)
-	MsgAPIServerStartFailed       = FFE("FF10151", "Unable to start listener on %s: %s")
-	MsgInvalidCAFile              = FFE("FF10152", "Invalid CA certificates file")
-	MsgTLSConfigFailed            = FFE("FF10153", "Failed to initialize TLS configuration")
-	MsgContextCanceled            = FFE("FF10154", "Context canceled")
+	MsgAPIServerStartFailed       = FFE("FF00151", "Unable to start listener on %s: %s")
+	MsgInvalidCAFile              = FFE("FF00152", "Invalid CA certificates file")
+	MsgTLSConfigFailed            = FFE("FF00153", "Failed to initialize TLS configuration")
+	MsgContextCanceled            = FFE("FF00154", "Context canceled")
 )
diff --git a/pkg/retry/retry_test.go b/pkg/retry/retry_test.go
index 48a47ed..32944b0 100644
--- a/pkg/retry/retry_test.go
+++ b/pkg/retry/retry_test.go
@@ -50,7 +50,7 @@ func TestRetryDeadlineTimeout(t *testing.T) {
 	err := r.DoCustomLog(ctx, func(i int) (retry bool, err error) {
 		return true, fmt.Errorf("pop")
 	})
-	assert.Regexp(t, "FF10154", err)
+	assert.Regexp(t, "FF00154", err)
 }
 
 func TestRetryContextCanceled(t *testing.T) {
@@ -63,5 +63,5 @@ func TestRetryContextCanceled(t *testing.T) {
 	err := r.Do(ctx, "unit test", func(i int) (retry bool, err error) {
 		return true, fmt.Errorf("pop")
 	})
-	assert.Regexp(t, "FF10154", err)
+	assert.Regexp(t, "FF00154", err)
 }