Fix lower/upper case problems (yes, really.)

This should fix most points of #5