Fixed package loading, some renames.