Changed mode naming