Change binary name in code + comment cleanup