As I recall, we have had this debate a while back in this very thread.
It has been agreed, as far as I understand, to use the pre-defined names and macros from the gcc-avr include files allowing both human readability and portability between various controllers.
The refactored code (already in the svn) is now using these extensively and custom #define for most of the application specific constants. Why are we having this conversation again?