profiles created in 2.0.4 break upon upgrade to 2.1

While completing comprehensive testing after our recent upgrade from 2.0.4 to 2.1.1, I noticed that the profiles associated with various groups are corrupted. It looks like the "Individual" group type's data fields have changed in the system in 2.1.1, and no longer include any address data. As such, when I edit one of our profiles, and the group type was set to Individual, data field "Street Address," it now displays Individual > "Birth Date," and no longer includes any of the old group mappings that were present in the previous version. I am concerned that data entered via this profile will not map to the appropriate fields in the database and data will be lost because of the change in group type>data field relationship.

Our upgrade script ran without errors, and we have generally been error free in the civicrm part of our site upgrade.