Rename

Change-Id: Icbbb81774a213c6cf4f7defb911a746351c63c11
Pull up parameter pickling to superclass

Change-Id: Ia381d38a5bf6d5e10bc21a21aa59743fca80bc7b