Renamed some funciton that were likely to clash with other (non-Opus) code