Copy-paste mistake from a31c5a2d56d369edee931a552dd00b0773bfbdd2.
More syncing between multiple implementations of pools.
Make allowed names more strict.
Follow-up to renaming components.