Naming convention further applied, TODOs.txt updated