Rename: path -> dir in some functions