Renamed some things to prevent future name collisions