Updated component's names