Make names consistent with Scala style guide