Now including ucase names to be used for CI querying