Changed a lot of component names to be more appropriate.