various doc and naming changes