rename "current_player" -> "reserved_for"
fixup "remove .... 2"