Update target references to use ${bundle.target}

Update target references to use ${bundle.target} #160