Rename TypeProvider to SubTypeFactory