revert service type renames and add support for date and time reformatting