Rename PropertyBaseType to ObjectBaseType
Properly nested AST