Update and fix some queries, start renaming them