Name refactor
Added todo