Got rid of ridiculous naming conventions

It's too bad Git can't tell when something is renamed vs. being deleted.