Corrected <component> @id's and labels in @name's for consistency.