tag: use simpler naming scheme

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>