Merge "Renamed things to fit with namechange of RicSynchronizationTask"