fix some naming problems (remove swiftclient)