minor doc and naming clean ups