reformat potential tags to follow intstructions

Replaced hardcoded values for name with dynamic calls to retrieve the
name instead