535: rename PathStorage->PathStore