Rename Overlay- and NaviagtionController