Fix arguments
Change some names
Finish changing names; modify migrations again