Fixing broken import in updates, standardizing namespaces of imports.
Merge pull request #768 from bcipolli/standardize_imports

Fixing broken import in updates, standardizing namespaces of imports.