Fixed Regressions due to name change