Package rename and very minor modifications