Fix names
Listen with class instances instead of the class itself because that's how it works