updated more namespace issues