Few fixes in namespaces, and Refactored name for interface.