Squashed service renaming commit