diff --git a/provider/schema/column.go b/provider/schema/column.go
index 0564336a..95e6b3cb 100644
--- a/provider/schema/column.go
+++ b/provider/schema/column.go
@@ -133,42 +133,42 @@ func (v ValueType) String() string {
 
 // ValueTypeFromString this function is mainly used by https://github.com/cloudquery/cq-gen
 func ValueTypeFromString(s string) ValueType {
-	switch strings.ToLower(s) {
-	case "bool", "TypeBool":
+	switch strings.TrimPrefix(strings.ToLower(s), "type") {
+	case "bool":
 		return TypeBool
-	case "int", "TypeInt", "bigint", "TypeBigInt", "smallint", "TypeSmallInt":
+	case "int", "bigint", "smallint":
 		return TypeBigInt
-	case "float", "TypeFloat":
+	case "float":
 		return TypeFloat
-	case "uuid", "TypeUUID":
+	case "uuid":
 		return TypeUUID
-	case "string", "TypeString":
+	case "string":
 		return TypeString
-	case "json", "TypeJSON":
+	case "json":
 		return TypeJSON
-	case "intarray", "TypeIntArray":
+	case "intarray":
 		return TypeIntArray
-	case "stringarray", "TypeStringArray":
+	case "stringarray":
 		return TypeStringArray
 	case "bytearray":
 		return TypeByteArray
-	case "timestamp", "TypeTimestamp":
+	case "timestamp":
 		return TypeTimestamp
-	case "uuidarray", "TypeUUIDArray":
+	case "uuidarray":
 		return TypeUUIDArray
-	case "inet", "TypeInet":
+	case "inet":
 		return TypeInet
-	case "inetrarray", "TypeInetArray":
+	case "inetrarray":
 		return TypeInetArray
-	case "macaddr", "TypeMacAddr":
+	case "macaddr":
 		return TypeMacAddr
-	case "macaddrarray", "TypeMacAddrArray":
+	case "macaddrarray":
 		return TypeMacAddrArray
-	case "cidr", "TypeCIDR":
+	case "cidr":
 		return TypeCIDR
-	case "cidrarray", "TypeCIDRArray":
+	case "cidrarray":
 		return TypeCIDRArray
-	case "invalid", "TypeInvalid":
+	case "invalid":
 		return TypeInvalid
 	default:
 		return TypeInvalid
diff --git a/provider/schema/column_test.go b/provider/schema/column_test.go
index fa486c0c..b71e58d7 100644
--- a/provider/schema/column_test.go
+++ b/provider/schema/column_test.go
@@ -143,6 +143,9 @@ func TestValueTypeFromString(t *testing.T) {
 	assert.Equal(t, ValueTypeFromString("JSON"), TypeJSON)
 	assert.Equal(t, ValueTypeFromString("bigint"), TypeBigInt)
 	assert.Equal(t, ValueTypeFromString("Blabla"), TypeInvalid)
+
+	assert.Equal(t, ValueTypeFromString("TypeBigInt"), TypeBigInt)
+	assert.Equal(t, ValueTypeFromString("TypeString"), TypeString)
 }
 
 func BenchmarkColumn_ValidateTypeInt(b *testing.B) {