removed todo
Name refactor