fixed client and some renames