Rename TypedQueryBuilder and NativeQueryBuilder