Fixed some bugs related to package names