removed costs/effects differentiation, renamings