Moved more name mapping from SimpleModelRenderer to SimplePropertyNameMapper