Fix a name-space problem with promotion