fix test and binary names (cherry picked from commit 18bcf5f2d474456c57cd94da234005a2...