Fix names according to name convention

Looks like nobody needs my pull #780.
Maybe this part of that pull is acceptable.