Updated namescape references