Components now have more appropriate names