And suddenly everything was named right
don't mind the change in names...