Change names to enable OS X compilation

Don't depend on case sensitive file systems