Start standardizing some of the defines, others will be able to be deleted soon