ENH:  Changing names to avoid clobber.