Added some rules for how to name things.