Some renaming work.
More work on embedded page rendering.