Renamed Actions and removed changes unrelated to this CL