Rename i var to arg_i, to allow other iterators
Add normalization of name capitalization