annotate -> rename
Set defaults + rejigger.