Change entity names to resemble doc (dash->hyphen,period->dot), add missing underscore entity