Updates naming convetion