Modified plugin name lookup