Change client to user

We're sticking with user for now until 

PS: Don't merge yet - will add more as we find them.