Yeah, there is a consistency there. It threw for a loop the first time I saw those sketches.

I think it's the final layout though cause the bedroom is pretty close to some concept art that was floating around for the 360 game. Besides, it'd be a little sad if all Naruto had was a tiny efficiency

Edit: Oh, the shot of his apartment in Shippuden 7 matches the sketches as well.

Here you go: