Revert "fix a few naming bugs"

This reverts commit 962caac936968e05a275dd21c2f77afb56a13d72.