use new golint syntax
rename types