some renames (esp. Holder -> Item and Property -> Trait)