Hypertension and renal failure

Hello everybody,
I need help coding below. How should I code these? I am so confused.

1) Acute renal failure with hypertension

This is "Acute", so I can't use hypertensive chronic kidney disease (403)
nor just acute kidney failure (584)?

2) Hypertensive renal disease with CRF

Does this mean simply "hypertensive chronic kidney disease"?
-403.90, 585.9?

Thank you!

Hypertension and renal failure