Cleaned up some defines. Now names make more sense