Corrected namespace issues