Refactor field names in activity and data type for id