renamed sub components