Naming change (FolderEntry --> TeaSafeFolder)