Normalize datastream names on object import.  Stories #37 and #99