Reduce enum class' names

Thanks to new scoping