Fixed package names for client