Revert "Revert "Rename pedram's XXX: naming scheme to TODO:""

This reverts commit 4d403fdb26d54e78db72cf99abbd3eda0f656d3a.