renaming related fixes

importing got a little more awkward, as namespace packages seem to have implications for import order, but it now works again...