urologist and kidney disease

I was diagnosed with having early diabetic nephropathy.......this was through the urinalisis.....I did the test again 30 days later, and this time all the indicators were okay......I was wanting to check with a urologist just to make one more check, I guess this is a dumb question but does a urologist take care of "kidney" ailemnts...i.e., am I going to the right kind of doctor?

Urology (from Greek οὖρον - oûron, "urine" and -λογία, -logia "study of") is the surgical specialty that focuses on the urinary tracts of males and females, and on the reproductive system of males. Medical professionals specializing in the field of urology are called urologists and are trained to diagnose, treat, and manage patients with urological disorders. The organs covered by urology include the kidneys, ureters, urinary bladder, urethra, and the male reproductive organs (testes, epididymis, vas deferens, seminal vesicles, prostate and penis). Both Urologists and General Surgeons operate on the adrenal glands.
http://en.wikipedia.org/wiki/Urology

Okay, so I'm going to the correct type of doctor....just always had the vague idea that a "urologist" was only penis, etc. I also have history of prostate cancer in the family....so that needs to be checked to I suppose, although the blood work for prostate has always been okay.