fix idPattern in remaining classes