Another rename, hopefully last + cleanups.

Signed-off-by: Cyril Hrubis <metan@ucw.cz>