fix failing integTests + more renamings in cpp domain