Documented Block, some renames