Removed old instances.  Update namespace defintions.