Change some more names to fit the Go naming conventions