Abort opt, smart naming, CLI cleanup