Some tweakings

@timlinux: I am just standardising the name with the three others..