Kaa-277: Refactoring of package names for Client/Server sync