Fixing component names