Agreed, the rename is probably premature. Especially given that we will likely be dropping the concept once we have the target API. (Still really unclear to me what the result of that will be)