Merge "C2 Vts: renaming dynamic and constant variables"