Change column names to use id/name conventions