Refactor Name Datenbank