Changing name. closes #7