rename functions
Merge branch 'raw_html'