Improved naming

Change-Id: I6aad157046ee7785b72810bcf8c7b40d2f355884
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>