Rename v2.2 and v2.3 constructors and maps