Refactor naming convention for Sprint 2.