Renamed module files and macros for clarity.