This change can go away if the change above to the `newFolderName` initializer also goes away