Cleanup and move to v1
Remove name we do not speak of in this project