Clean-up usage of path names