Bug Fix: Tag names are uppercase