Fix the wierd scope naming