Changes and adding actual names

Signed-off-by: Jani <jani.sinervo@gmail.com>