Bug fixes and renaming of example code.