Fix issues with name of binary