waves name cleanup