Undo some underscore naming