Fixed naming collision with datatype