changes to naming to allow for comps with different file systems