Aligned namespaces (didn't seem to take the first time, or I missed these 2 files)