Fix naming race/subcontext and version

Fix naming race/subcontext and version