diff --git a/cmd/protoc-gen-cpp-tableau-loader/embed/templates/hub.pc.cc.tpl b/cmd/protoc-gen-cpp-tableau-loader/embed/templates/hub.pc.cc.tpl
index 26da2c77..7424105e 100644
--- a/cmd/protoc-gen-cpp-tableau-loader/embed/templates/hub.pc.cc.tpl
+++ b/cmd/protoc-gen-cpp-tableau-loader/embed/templates/hub.pc.cc.tpl
@@ -4,7 +4,7 @@
 #include "logger.pc.h"
 #include "util.pc.h"
 {{ if not .Shards }}
-{{ range .Protofiles }}#include "{{ toSnake .Name }}.pc.h"
+{{ range .Protofiles }}#include "{{ .Name }}.pc.h"
 {{ end }}{{ end }}
 namespace tableau {
 std::once_flag Registry::once;
diff --git a/cmd/protoc-gen-cpp-tableau-loader/embed/templates/hub_shard.pc.cc.tpl b/cmd/protoc-gen-cpp-tableau-loader/embed/templates/hub_shard.pc.cc.tpl
index 4bc3dafc..6b15f5b2 100644
--- a/cmd/protoc-gen-cpp-tableau-loader/embed/templates/hub_shard.pc.cc.tpl
+++ b/cmd/protoc-gen-cpp-tableau-loader/embed/templates/hub_shard.pc.cc.tpl
@@ -1,6 +1,6 @@
 #include "hub.pc.h"
 
-{{ range .Protofiles }}#include "{{ toSnake .Name }}.pc.h"
+{{ range .Protofiles }}#include "{{ .Name }}.pc.h"
 {{ end }}
 namespace tableau {{ "{" }}{{ range .Protofiles }}{{ range .Messagers }}
 template <>
diff --git a/cmd/protoc-gen-cpp-tableau-loader/orderedmap/ordered_map.go b/cmd/protoc-gen-cpp-tableau-loader/orderedmap/ordered_map.go
index c833ef65..2618d498 100644
--- a/cmd/protoc-gen-cpp-tableau-loader/orderedmap/ordered_map.go
+++ b/cmd/protoc-gen-cpp-tableau-loader/orderedmap/ordered_map.go
@@ -49,9 +49,6 @@ func (x *Generator) GenHppOrderedMapGetters() {
 	if !x.NeedGenerate() {
 		return
 	}
-	x.g.P()
-	x.g.P(helper.Indent(1), "// OrderedMap accessers.")
-	x.g.P(" public:")
 	x.genHppOrderedMapGetters(x.message.Desc, 1, nil)
 }
 
@@ -59,6 +56,11 @@ func (x *Generator) genHppOrderedMapGetters(md protoreflect.MessageDescriptor, d
 	for i := 0; i < md.Fields().Len(); i++ {
 		fd := md.Fields().Get(i)
 		if fd.IsMap() {
+			if depth == 1 {
+				x.g.P()
+				x.g.P(helper.Indent(1), "// OrderedMap accessers.")
+				x.g.P(" public:")
+			}
 			nextKeys := keys.AddMapKey(helper.MapKey{
 				Type: helper.ParseMapKeyType(fd.MapKey()),
 				Name: helper.ParseMapFieldName(fd),
@@ -82,7 +84,7 @@ func (x *Generator) genHppOrderedMapGetters(md protoreflect.MessageDescriptor, d
 				x.g.P(" private:")
 				x.g.P(helper.Indent(1), orderedMap, " ordered_map_;")
 			}
-			return
+			break
 		}
 	}
 }
@@ -91,8 +93,6 @@ func (x *Generator) GenOrderedMapLoader() {
 	if !x.NeedGenerate() {
 		return
 	}
-	x.g.P(helper.Indent(1), "// OrderedMap init.")
-	x.g.P(helper.Indent(1), "ordered_map_.clear();")
 	x.genOrderedMapLoader(x.message.Desc, 1)
 }
 
@@ -100,6 +100,10 @@ func (x *Generator) genOrderedMapLoader(md protoreflect.MessageDescriptor, depth
 	for i := 0; i < md.Fields().Len(); i++ {
 		fd := md.Fields().Get(i)
 		if fd.IsMap() {
+			if depth == 1 {
+				x.g.P(helper.Indent(1), "// OrderedMap init.")
+				x.g.P(helper.Indent(1), "ordered_map_.clear();")
+			}
 			orderedMapValue := x.mapValueType(fd)
 			itemName := fmt.Sprintf("item%d", depth)
 
diff --git a/cmd/protoc-gen-go-tableau-loader/orderedmap/ordered_map.go b/cmd/protoc-gen-go-tableau-loader/orderedmap/ordered_map.go
index 39430d7c..32c81333 100644
--- a/cmd/protoc-gen-go-tableau-loader/orderedmap/ordered_map.go
+++ b/cmd/protoc-gen-go-tableau-loader/orderedmap/ordered_map.go
@@ -52,7 +52,6 @@ func (x *Generator) GenOrderedMapTypeDef() {
 	if !x.NeedGenerate() {
 		return
 	}
-	x.g.P("// OrderedMap types.")
 	x.genOrderedMapTypeDef(x.message.Desc, 1, nil)
 }
 
@@ -60,6 +59,9 @@ func (x *Generator) genOrderedMapTypeDef(md protoreflect.MessageDescriptor, dept
 	for i := 0; i < md.Fields().Len(); i++ {
 		fd := md.Fields().Get(i)
 		if fd.IsMap() {
+			if depth == 1 {
+				x.g.P("// OrderedMap types.")
+			}
 			nextKeys := keys.AddMapKey(helper.MapKey{
 				Type: helper.ParseMapKeyType(fd.MapKey()),
 				Name: helper.ParseMapFieldNameAsFuncParam(fd),
@@ -81,7 +83,7 @@ func (x *Generator) genOrderedMapTypeDef(md protoreflect.MessageDescriptor, dept
 			}
 			x.g.P("type ", orderedMap, "= ", helper.TreeMapPackage.Ident("TreeMap"), "[", keyType, ", ", x.mapValueFieldType(fd), "]")
 			x.g.P()
-			return
+			break
 		}
 	}
 }
@@ -104,7 +106,6 @@ func (x *Generator) GenOrderedMapLoader() {
 	if !x.NeedGenerate() {
 		return
 	}
-	x.g.P("// OrderedMap init.")
 	x.genOrderedMapLoader(x.message.Desc, 1, nil, "")
 }
 
@@ -113,6 +114,9 @@ func (x *Generator) genOrderedMapLoader(md protoreflect.MessageDescriptor, depth
 	for _, field := range message.Fields {
 		fd := field.Desc
 		if fd.IsMap() {
+			if depth == 1 {
+				x.g.P("// OrderedMap init.")
+			}
 			needConvertBool := len(keys) > 0 && keys[len(keys)-1].Type == "int"
 			nextKeys := keys.AddMapKey(helper.MapKey{
 				Type: helper.ParseMapKeyType(fd.MapKey()),