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

This reverts commit a78d202027b66bce0cf2fa9420bc4d8e5abca391.