Changed names and descriptions