fix some namespace problems

test fails