Refactor EventType to enable substitution on resource_instance_uri.  Change schema namespace