rename package, fix compile errors