Renaming notes to TODO to fit scheme