refractor names, update endgame layout