Make binary name consistent
Merge branch 'compile-PR' into H2