Fixed renamed clusterfucks.. TODO: need to unify the renames in
QueryAnalysis