Cleaning up, trying to use names with only 6 chars, so that it's compatible with Win 3.11.