Dependencies added, naming changes

see title