Bring CPS in sync with math
Merge branch 'master' of https://github.com/np/names-for-free
minor