Some minor renaming

Probably not the last of its kind but finding somekind of appropriate
name is alwasy a ...

Change-Id: I6251f0e07716ee500457aa6e91a48dc7f386f697