Use cleaner naming scheme for iso output