Rename sql_query to query (R16B+)