Adjust code to adapt multiple locations
Merge to adjust function name