Name Change and api tweaks