Rename some methods, fix trees (not the right way but at least they arent misplaced)