remove redundant component naming