Working through cv-name replacement