improved names of class constants