Add todo item
Some naming convention changes