More meaningful names in query.py