Datatype change, correct naming