Renamed Query constants, changes to gitignore