As the original Vuex ones have been removed, the apollo_client suffix
can be removed from the new ones.

There are a few minimal changes within the files to clean up the
ApolloClient within the files as well.