rename MenuType and other CR feedback