Refactors method names and database entries