Add Thrift.
Correct Spark name scheme.