Revert some system names
Add more extensions