Data constructor name cleanup.