Some quick renaming
Fixed some conflicts