Also rename Partition to HivePartition otherwise it is confusing in the code