renamed components