Use underscore names for consistency