Name Change fixes