Writer class name has been updated for consistency.

(cherry picked from commit 78418ac08aa55da2e39426e2f4d4eb60c5290bb1)