Mass rename to match new defaults