simplify runtime naming, fix provisioning errors