Naming convetions fixed
Fixed naming convetion usage