Re-use actual names 

This gives slightly more client-side flexibility
Small work on the RoB table