fixed naming rules