Fixing some names