Change object type names because it seems to make sense.