Rename FileSystemBase to GenericFileSystem