clarified component names