Last set of consistency changes.

I don't feel so strongly about these but I think where text replaces graphics having it always be in upper case and square brackets makes sense.