minor rename of enhanced method/field names