Fix: callback function names,
Merge pull request #18 from bigmouth/Feature_RestructuringSDK3_3

Fix: callback function names,