Cleanup of label renaming infrastructure, add subsection support