Replaced sound string names to enum
merged branches