Added Configuration
Corrected naming of components and configuration