Fixed bugs resulting from using old variable names.
Update examples to reflect changes to project hierarchy and method names.