Initial rename and updates for new server