#54: Made all data name classes to enums.