Change naming rules