Functions renamed to new naming convetion, TODOs.txt updated