Remove mention of workspace2 and rename auxp.