use the same naming everywhere Change-Id: Ic9106a17eb0979278f12f2ea2b7c1a04bc448745 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>