Name refactor