Support both the unstable and stable identifiers. A future release will disable the unstable identifiers.