Rename db fields for consistency [SERINA-10]