Rework some naming text
What the heck: add rendered forms in master