Changing to match VAB dir and naming conventions