Change SQL Queries to include concat of DB_NAME constant throughout