Avoid string casing problems (#11970)

Change-Id: Id5c1f496bcd754e1c7e16e0df0d451d9a0bf054e