Rename more stuff, remove Dependency (unnecessary)