Rename Common to Query.Common