Rename to support upcoming features.