Rename the defines needed to be more clear and unique and also add a mapping plist.