Renaming some parameters passed to DB-related methods to better