Fix HashMaps using name instead of UUID