Fix source file and namespace