refactor: beautification for the naming convesion

[swarna1101]

We need to follow correct naming and branding conventions as suggested by @sajz https://www.notion.so/Naming-Branding-Alignment-262fe543413980338b13c8b26014ae22#262fe543413980338b13c8b26014ae22