Updated CallBack names, internal class name

Small changes to get this plugin working on the latest nightly again.