Update some references to old typesystem