fix the package naming scheme