Fix directory variable names