Taking out 'change name' TODOs