Resubmission to fix existing paths

Fixing issues such as wrong label for some entities, comment (instead of comments), list of refs, and other misc...