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

This reverts commit 44eeccc053ca535fb26201b2bd091f8da4182af9.