Remove hyphen in grayscale

Very small followup to an earlier MR, changing the few remaining gray-scale(d) to grayscale.

Also removed a camel case that looked out of place.