Refactor

Consistent naming changes as in query_dbus_data_postgres.py