Fix Naming Conversion