Add space before label
Rename auto-generated labels