Improve path names