Tweaked namespaces and property names