Improve use of BIN_NAME variable.