Rename hrl file and add some shared macros