I know it's ridiculous to change this name just for consistency, but I changed this name just for consistency.  Sorry about dirtying up the diff with this.