Rename
Change to ids / keys. Refactor.