Bug 1096633 - Fix namespacing issue. CLOSED TREE