Changed the packag names to match with the client package name