Factor out property names, fix things for T3.