Revert "Changed CPT name generation algorithm - see Wiki!"

This reverts commit f058feafd16b2b0543580a985d18267925284b13.