[Upg] Default encoding
[Upg] Apply namespace changes
[Upg] Rename