Fixed typo in datatype-mapper
Added null check
Added NameMapper