some name cleanup.