Fixed pipeline issues regarding final names