Rename factories
Add hshn/class-matcher-bundle