MDL-35332: Remove underscore from variable name