Short names should work now. The demands will no longer fail for the good batch