Rename exp to query