normalised names, added workflow