diff --git a/agent-go/a_init/BastionInitializaion.go b/agent-go/a_init/BastionInitializaion.go
index 0b77ac1..46b0cfb 100644
--- a/agent-go/a_init/BastionInitializaion.go
+++ b/agent-go/a_init/BastionInitializaion.go
@@ -76,7 +76,7 @@ func BastionModeInit() {
 		Comment:         "",
 		MachineID:       "",
 		AgentVersion:    "",
-		TopicName:       "BastionNode",
+		AgentTopicName:  "BastionNode",
 	}
 
 	// build for bastion mode operator
diff --git a/server-go/entity/ServerInfo.go b/server-go/entity/ServerInfo.go
index 5c5635d..25f4dd6 100644
--- a/server-go/entity/ServerInfo.go
+++ b/server-go/entity/ServerInfo.go
@@ -8,7 +8,7 @@ type ServerInfo struct {
 	gorm.Model
 
 	ServerName       string `grom:type`
-	TopicName        string
+	AgentTopicName   string
 	ServerIPPublicV4 string
 	ServerIPInnerV4  string
 	ServerIPPublicV6 string