diff --git a/go/extractor/dbscheme/tables.go b/go/extractor/dbscheme/tables.go
index f929e79793b..665ecdcc240 100644
--- a/go/extractor/dbscheme/tables.go
+++ b/go/extractor/dbscheme/tables.go
@@ -856,7 +856,7 @@ var ChanTypes = map[gotypes.ChanDir]*BranchType{
 }
 
 // DefinedType is the type of defined types
-var DefinedType = TypeKind.NewBranch("@namedtype", CompositeType)
+var DefinedType = TypeKind.NewBranch("@definedtype", CompositeType)
 
 // TypeSetLiteral is the type of type set literals
 var TypeSetLiteral = TypeKind.NewBranch("@typesetliteraltype", CompositeType)
@@ -1138,7 +1138,7 @@ var BaseTypeTable = NewTable("base_type",
 // UnderlyingTypeTable is the table associating defined types with their
 // underlying type
 var UnderlyingTypeTable = NewTable("underlying_type",
-	EntityColumn(DefinedType, "named").Unique(),
+	EntityColumn(DefinedType, "defined").Unique(),
 	EntityColumn(TypeType, "tp"),
 )
 
diff --git a/go/ql/lib/go.dbscheme b/go/ql/lib/go.dbscheme
index 4bd57e09327..b3da71c3ac2 100644
--- a/go/ql/lib/go.dbscheme
+++ b/go/ql/lib/go.dbscheme
@@ -184,7 +184,7 @@ methodreceivers(unique int method: @object ref, int receiver: @object ref);
 
 fieldstructs(unique int field: @object ref, int struct: @structtype ref);
 
-methodhosts(int method: @object ref, int host: @namedtype ref);
+methodhosts(int method: @object ref, int host: @definedtype ref);
 
 defs(int ident: @ident ref, int object: @object ref);
 
@@ -202,7 +202,7 @@ element_type(unique int container: @containertype ref, int tp: @type ref);
 
 base_type(unique int ptr: @pointertype ref, int tp: @type ref);
 
-underlying_type(unique int named: @namedtype ref, int tp: @type ref);
+underlying_type(unique int defined: @definedtype ref, int tp: @type ref);
 
 #keyset[parent, index]
 component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
@@ -506,7 +506,7 @@ case @type.kind of
 | 35 = @sendchantype
 | 36 = @recvchantype
 | 37 = @sendrcvchantype
-| 38 = @namedtype
+| 38 = @definedtype
 | 39 = @typesetliteraltype;
 
 @basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
@@ -531,7 +531,7 @@ case @type.kind of
              | @stringliteraltype | @nilliteraltype;
 
 @compositetype = @typeparamtype | @containertype | @structtype | @pointertype | @interfacetype | @tupletype
-               | @signaturetype | @namedtype | @typesetliteraltype;
+               | @signaturetype | @definedtype | @typesetliteraltype;
 
 @containertype = @arraytype | @slicetype | @maptype | @chantype;
 
diff --git a/go/ql/lib/semmle/go/Types.qll b/go/ql/lib/semmle/go/Types.qll
index 4ba604a9a08..4eb3a3e0302 100644
--- a/go/ql/lib/semmle/go/Types.qll
+++ b/go/ql/lib/semmle/go/Types.qll
@@ -1032,7 +1032,7 @@ class SendRecvChanType extends @sendrcvchantype, ChanType {
 deprecated class NamedType = DefinedType;
 
 /** A defined type. */
-class DefinedType extends @namedtype, CompositeType {
+class DefinedType extends @definedtype, CompositeType {
   /** Gets the type which this type is defined to be. */
   Type getBaseType() { underlying_type(this, result) }