I'd rather keep the current convention -- if we update this everywhere, that's going to make any change we merge from the Harvard version of the XBlock conflict with the current codebase.