Fix issue with path naming