Fix same enum names as other Reachability class
Merge branch 'fix-reachability-enum-redefinition' into denivip