Fixing naming schema