Fixed errors and enum naming