Branch/fix case

This fixes the case (uppercase/lowercase) issues we were seeing on linux servers.

@BrettASwift would you mind reviewing?  (and if you find it acceptable, merging it for me?)