update profile with renamed components
fix merge conflicts