Update class names due to site changes

With this change, both the plugin and unit tests work for me.