Name changes
Merge branch 'develop' of github.com:elliottbiondo/sampling_sandbox into develop