Changed slots and signal names