Use the appropriate names for the various screens consistently
Simplify files