refactored to match Dragon's blueprint terminology
some missing renames