changed enum names