Merge "Fix wrong symlink terminology"