made package names consistent