changed names for better unix editing