Jim Brikman feedback added around naming and augmenting setup