+ changed naming pattern for default marshallers
+ some cleanup