Fixing naming convention