adapted cmakelists
updated to generic names