Fix reserved identifier violations.

This is a companion update suggestion for the issue "[reserved identifier violation](https://github.com/cockpit-project/cockpit/issues/201 "Check standard-compliance of identifiers")".

Affected identifiers can become standard-compliant by the shown renaming.