Naming refactor has been applied