to fix some name rules