fixed a couple minor regressions due to name changes