Update components
Update naming