some name changes, for windows