Updating some View files to follow convention