Revert "Switch to name with underscore"

This reverts commit 91eed939c175417fb1545ce30e8e8269b6ab18b9.