1. What is the problem?
This is not a bug fix but to attend naming inconstistency
at this early stage of the project.
2. What is the solution for the problem?
To correct and maintain a consistent naming sequence for project.
3. What features need to be implemented for Tricircle?
None
Change-Id: I84d6e2aa76f0e61f39f20cacf19fe6333d82aa1f
Closes-Bug: #1571136