Refactored identity mapping info

Now consistently uses the suffix string as the value exposed by the
identity property. A few unit tests remain to be updated.