Go back to old naming config