RFC: Improved CP Syntax

Shouldn't we keep the `keyName` passed in?