Changed name to more relevant ones
Fixed Conflicts
Changed names