comments #36 - some semantic changes after the namechange

Signed-off-by: Alexander Skjolden <alex@plastboks.net>
Mterge branch 'alertsettings' into develop