Revert ownership and container conventions to RFC status