Windward and upwind are different in my book: windward is anything to the side of the boat opposite the main boom, whereas upwind is you draw a line perpendicular to the wind direction and anything toward the wind from that line is upwind. You could have a mark downwind of you on the windward side if you overshot the last tack before a mark.