CLOUDIFY-1110 use base dir and name instead of name alone