Adding missing systems and renaming some of them