Improved naming of some identifiers.