Some name changes and changes based on updated requests to Knex.