re #424 Update naming rules and add test for it