BACKWARDS INCOMPATIBLE: Changed attribute names on HybridView

Codereview fixes for dd9a0f3