[BUGFIX] Check both possible ViewHelperVariableContainer variable names
[BUGFIX] Same fix as before, different place
[BUGFIX] Correct view class name
[TASK] Switch to new Provider class names in Flux