Any reason we don't want to go for consistency here?  (codenames with '_')  If they are already in deployed code, that would be a reason, but these are not yet, no?