Updates for v1_6_R3 core names.