Fix plugin name resolution (again)