#330 Fix CMake bugs found during testing of project and package names with dash and underscore. Update basisproject to support the new scheme.