Merge "Fix additional usage of incorrect case"