Refactor Naming Convention