Fix autogen warnings about directive renames