rename and tweak args.