Macros: rename helper class