fix tag name preparations