binary naming improvements