fix: rm name duplication: 

don't use var names which overlap syntax keywords