Update and rename friends to friend