Renamed macros.jl