Made classes uppercase