Fix compile errors.

Some compile errors from inconsistent naming.