Don't wrap null engines
Change name inline with parent API naming