Renamed all enum <...>keys classes to <...>key