Minor correction to avoid name conflicts.