Fixed component names