Namespace fix 2 (more to come)