some name clean-up
docs