More IdP cleanups. Beginning the move to new naming scheme in configs.