Minor fixes

Changed some signals names.