Replaced old-style enum namespace-trick with enum classes