Minor Fix - Was not persisting the names into the wrapped entity
Merge remote-tracking branch 'origin/master'