Merge with ABR's changes, fix workflow name references