MDL-31989 fixing capitalization errors introduced in last commits