Class naming scheme re-factoring: move towards better consistency.