More in line with current naming conventions. Change-Id: I63f6677bd12d82f6749032996585d761f1a74fb7 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
