Namechanges

plus some value changes