Fixed UNIX naming issues