Fix a few small errors in naming