style
rename per function
oops, fix case
placeholders for consistency