Renaming to user activity and client
MOre renaming
More renaming