Add database friendly names