ViewBase - renamed vars and files