Updated naming rules.