Namming refactor