Add rename arg handler