LQE-217: Renamed packages