Closer to the likely-upcoming naming conventions - and at this point
we likely can drop the "plasma" distinction.