Fixing the names to accurately reflect the contents
Fixing a couple of bugs around save behavior and loaders
Merge pull request #709 from bhariharan/smart_sync_sample

Fixing the names to accurately reflect the contents