Correct rename of views from earlier commit:209dd87e

Sorry @superchris - My previous PR missed 2 renames, below are those renames and spec renames too.