Revert "Updating naming convention"

This reverts commit 91878823e0aca214f3e6358d0ba90e344ba74d5b.
Revert "Revert "Updating naming convention""

This reverts commit 51680fa95d95fc74b790d505dafb4fcce6f711eb.