Fix namespaces #3199 #3200
Less overhead