Make names consistent with other code