Merge "adf: rename."