         when 'p'
           [player, slot] = args.splice(0, 2)
           pokemon = @model.getPokemon(player, slot)
-          pokemon.getName()
+          pokemon.escape('name')
         when 't'
           [player] = args.splice(0, 1)
-          @model.getTeam(player).get('owner')
+          @model.getTeam(player).escape('owner')
         when 'ts'
           [player] = args.splice(0, 1)
           text = if @isFront(player)


  boost: (player, slot, deltaBoosts, options = {}) =>
    pokemon = @model.getPokemon(player, slot)
    pokemonName = pokemon.getName()
    stages = pokemon.get('stages')
    $pokemon = @$pokemon(player, slot)
    $effects = $pokemon.find('.pokemon-effects')

    @renderWaiting()

  addMoveMessage: (owner, pokemon, moveName) =>
    @chatView.print("<p class='move_message'>#{owner}'s #{@pokemonHtml(pokemon)} used <strong>#{moveName}</strong>!</p>")
    @addSummary("#{owner}'s #{pokemon.escape('name')} used <strong>#{moveName}</strong>!", newline: true, big: true)

  addLog: (message) =>
    @chatView.print("<p>#{message}</p>")
