Renaming cleanup to shed compiler warnings.