Merge "Rename ext charts"