Fixed names for screens and buttons.