Fix some inconsistent naming.