Fix class name issue, ignore case issue and regular expression issue