simple rename and better EXIT_CODES