Some variable naming cleanups