Varname fixups in CMakeLists.txt
Making use of add_xxx_sources macros