rename for clarity

* TODO clean up the SQL, man