Rename and reflow client-side section.