Name Change and other small fixes