Use C++20 using enum instead of aliasing enum members manually

Use C++20 using enum instead of aliasing enum members manually #1187