Minor name changes for some rules