More naming cleanup

Making things read more easily.