FileXXX -> WrappedXXX
small refactoring for wrapperstore