First attempt on 1.5 update.

Most of it was done using search and replace so some might not be
correct.