buildfix and avoid name conflict

Created by  boogerlad  on March 29, 2020
Y4CGGXO7OJRSU36XZRIUVTGX73BXSKUY566ZWXIFO3UP7Y6JXXUQC
Change contents