Use variable names that better match the PHP documentation.

refs #319, #312