Standardise tag usage

Signed-off-by: Seth Warburton <seth@internet-inspired.com>