Fixing naming conventions