Scheduling Namespace fixing