Fixed other bugs related to system name change