finishing up rename, adding migration