Agreed with the client/tracker naming. Done here - https://github.com/wordpress-mobile/WordPress-iOS/commit/927fa5a983f116bf0409f57674f4fd3c54783c8b