Fixed requirements and template macro naming