updated apex classes to custom labels