Class renaming
Sound handler update / testing