Config to default tor, tenant and subject towards more logical fields