fix grammar
adapt to new package names