Correct naming & Clean up dependancy tree a bit