Named components; removed events