Fixed packages moved in the latest Choco library refactor.