Fixes using @ in query. Fixes naming conventions.