revised wrap property names
machinemade