Renaming of some elements; added some components and methods to existing components