update file header comments
make rename syntax easier to read
partial passing tests

camel cased singular and plural template variables are transformed