todos and renaming