Revert "Fix naming inconsistency"

This reverts commit 636625bf767e4b1f12c0784b4312b84877af809e.