Merge with main and update name of macro