Renaming builder class names and content

(references #166)
Renaming content of other classes + framework comments

(references #166)