Fixed bug where cmake function changed names between branches