diff --git a/pkg/writers/bun/type_mapper.go b/pkg/writers/bun/type_mapper.go
index e7a762d..d0cf404 100644
--- a/pkg/writers/bun/type_mapper.go
+++ b/pkg/writers/bun/type_mapper.go
@@ -133,10 +133,10 @@ func (tm *TypeMapper) bunGoType(sqlType string) string {
 		"decimal":          tm.sqlTypesAlias + ".SqlFloat64",
 
 		// Date/Time types
-		"timestamp":                   tm.sqlTypesAlias + ".SqlTime",
-		"timestamp without time zone": tm.sqlTypesAlias + ".SqlTime",
-		"timestamp with time zone":    tm.sqlTypesAlias + ".SqlTime",
-		"timestamptz":                 tm.sqlTypesAlias + ".SqlTime",
+		"timestamp":                   tm.sqlTypesAlias + ".SqlTimeStamp",
+		"timestamp without time zone": tm.sqlTypesAlias + ".SqlTimeStamp",
+		"timestamp with time zone":    tm.sqlTypesAlias + ".SqlTimeStamp",
+		"timestamptz":                 tm.sqlTypesAlias + ".SqlTimeStamp",
 		"date":                        tm.sqlTypesAlias + ".SqlDate",
 		"time":                        tm.sqlTypesAlias + ".SqlTime",
 		"time without time zone":      tm.sqlTypesAlias + ".SqlTime",
diff --git a/pkg/writers/bun/writer_test.go b/pkg/writers/bun/writer_test.go
index 188efe2..d97e75c 100644
--- a/pkg/writers/bun/writer_test.go
+++ b/pkg/writers/bun/writer_test.go
@@ -567,8 +567,8 @@ func TestTypeMapper_SQLTypeToGoType_Bun(t *testing.T) {
 		{"bigint", false, "resolvespec_common.SqlInt64"},
 		{"varchar", true, "resolvespec_common.SqlString"}, // Bun uses sql types even for NOT NULL strings
 		{"varchar", false, "resolvespec_common.SqlString"},
-		{"timestamp", true, "resolvespec_common.SqlTime"},
-		{"timestamp", false, "resolvespec_common.SqlTime"},
+		{"timestamp", true, "resolvespec_common.SqlTimeStamp"},
+		{"timestamp", false, "resolvespec_common.SqlTimeStamp"},
 		{"date", false, "resolvespec_common.SqlDate"},
 		{"boolean", true, "bool"},
 		{"boolean", false, "resolvespec_common.SqlBool"},
diff --git a/pkg/writers/gorm/type_mapper.go b/pkg/writers/gorm/type_mapper.go
index 8a92836..a8a0eba 100644
--- a/pkg/writers/gorm/type_mapper.go
+++ b/pkg/writers/gorm/type_mapper.go
@@ -158,10 +158,10 @@ func (tm *TypeMapper) nullableGoType(sqlType string) string {
 		"decimal":          tm.sqlTypesAlias + ".SqlFloat64",
 
 		// Date/Time types
-		"timestamp":                   tm.sqlTypesAlias + ".SqlTime",
-		"timestamp without time zone": tm.sqlTypesAlias + ".SqlTime",
-		"timestamp with time zone":    tm.sqlTypesAlias + ".SqlTime",
-		"timestamptz":                 tm.sqlTypesAlias + ".SqlTime",
+		"timestamp":                   tm.sqlTypesAlias + ".SqlTimeStamp",
+		"timestamp without time zone": tm.sqlTypesAlias + ".SqlTimeStamp",
+		"timestamp with time zone":    tm.sqlTypesAlias + ".SqlTimeStamp",
+		"timestamptz":                 tm.sqlTypesAlias + ".SqlTimeStamp",
 		"date":                        tm.sqlTypesAlias + ".SqlDate",
 		"time":                        tm.sqlTypesAlias + ".SqlTime",
 		"time without time zone":      tm.sqlTypesAlias + ".SqlTime",
diff --git a/pkg/writers/gorm/writer_test.go b/pkg/writers/gorm/writer_test.go
index 514ec4a..65ab0e6 100644
--- a/pkg/writers/gorm/writer_test.go
+++ b/pkg/writers/gorm/writer_test.go
@@ -655,7 +655,7 @@ func TestTypeMapper_SQLTypeToGoType(t *testing.T) {
 		{"varchar", true, "string"},
 		{"varchar", false, "sql_types.SqlString"},
 		{"timestamp", true, "time.Time"},
-		{"timestamp", false, "sql_types.SqlTime"},
+		{"timestamp", false, "sql_types.SqlTimeStamp"},
 		{"boolean", true, "bool"},
 		{"boolean", false, "sql_types.SqlBool"},
 	}