Cleaned up internal symbols to be named jhn__foo