remove TODO about rename; let's do this in a next step (needs to go through NEW)