Renamed Impala/Hive Queries and added prepare statements