Fix naming rules.