Rename methods to match the corresponding callback.
Better demo and lots of fixes.