rename 'name' variables to something more useful

for #101