Fixed DataTypeKey entries to match convention