Fixed a name clash issue.