TypesQuery -> TypeQuery