change names of screens

also change filenames