Name refactor and additional call name