Minor renaming/formatting changes.