[Philip] Change some names and Modify the schemas