Small name re-factorings.