Change some method names and sounds