Change name handling, add pie.