1fc9838
forge: clean up naming to be more generic and better fit with other macro packages in the distribution