Fixed wrong filenames that caused a bug after namespace change.