Block: Updated documentation, and changed to use consistent naming.