Code style/naming enhancements.