Adapt configuration to new names