Rename ClientContext.class to ClientContext