Rename system and component add function into use