Package updates, switch from haddock-internal to haddock-api