[MODULES-690] - Fix server_package_name problem

Add a wrap on server_package and client_package