Note that there is no need to make caption separate attribute - I have added configuration naming support rather long ago (for similar reasons; but I was too lazy to actually automate building both)