rename packeage and fix warning