Proposed change to CPTs to better define plural names