More fixes for the API change of rule names to STL.