Merge "Extract common site naming functions"