Minor rename of views