more namespace renames, first really working version