Renamed some stuff, panda doesn't like the role?