Add rules and fix file name