make config names more consistent with each other