some corrections because of new package name