fixed more filename conflicts