#20: Moved returns to delegation and renamed existing delegations