Clean up poms - names are just confusing
Try to build a sensible default item id