Making names consistent

Using _path rather than _dir for everything