Minor renames.