Back to the old class name

Signed-off-by: Umair Khan <omerjerk@gmail.com>
Added preference to change carrier label

Signed-off-by: Umair Khan <omerjerk@gmail.com>