Rename traits to match new compiler version.