Merge "Conform to new naming" into sc-dev