Fix a couple NameErrors left over from the package refactor