Remove underscores for consistency with rest of codebase.