diff --git a/schema/naming.go b/schema/naming.go
index dbc71e04..e3b2104a 100644
--- a/schema/naming.go
+++ b/schema/naming.go
@@ -95,7 +95,7 @@ func toDBName(name string) string {
 	if name == "" {
 		return ""
 	} else if v, ok := smap.Load(name); ok {
-		return fmt.Sprint(v)
+		return v.(string)
 	}
 
 	var (
@@ -134,6 +134,7 @@ func toDBName(name string) string {
 	} else {
 		buf.WriteByte(value[len(value)-1])
 	}
-
-	return buf.String()
+	ret := buf.String()
+	smap.Store(name, ret)
+	return ret
 }