changed sender id property name
changed config properties name
refactored with the right naming convention