re riged, consistant api
updated generated code