Fix naming
Use allocator in fs