Refactoring database field names