Naming and placing unification

Signed-off-by: Frantisek Kolacek <fkolacek@redhat.com>