change variable names to conform to go formatting requirements