Merge fixes for name change conflicts and javascript errors.

Still lack of communication with backend.