Changing some property names to make things xap and monitor defaults easier to differentiate