Fixed conflicting names for simc stuff

whatever