Simplify plugin name registration
Fix broken tests