Minor renaming in some views