Correcting debug variables through out the code to use the same one.