Also unify naming and add details where they were missing. Signed-off-by: Daniel Golle <daniel@makrotopia.org>