renamed object model parts to better reflect actual purpose
continued renaming elements to better and consistently reflect their
actual purpose