Rename X-tags to X-tag