change datatype, correct naming issue