Fixed a small logic bug in the name identifier mapping. Bugzilla #311.