Fixes variable and function names to underscore convention.
Changes TODOs to TODO-BLOCKERs.