Rename models continued
Use python2