Added naming plan for refactoring