Feature/name refactor