- changed names of custom tags to avoid conflicts