Renames query service class and added new query service class.