WK-445 renamed keys for serializer