Fixing naming

Synchronizing naming schema