Move naming conventions up where it should be.