Component re-naming