documentation, renaming, adding and various improvements on UMapDefs