Refactor extraction stage names