wrapppers: Renaming wrappers to be more generic This removes assumptions from the wrapper around which compiler is using the wrapper.