minor updates for naming conventions