rename many things
rename more things
everything is now written in φ!