Switching to namespaces to solve upgrade bug

Change-Id: I472abf44125a03702f0bab7ee10c4e37ff846ac1