fix naming rules