Fix names in config again after last revert.