Fix queries to upper camel