Fixing the name problem with different OS