Changing name of constants -- kazu
Changing naming scheme --kazu