Renamed some property names and record keyword query