Make cmakelists naming a bit more consistent