Use names consistent with database in API #113
Use names consistent with API in template #113