minor naming fixes from golint