Updated files to use namespace conventions.