PTFM-10636: Use new instance type names