added name/build name support and updated variable merges as a result