Change filename scheme to fit the rest