Streamlined naming
Updated documentation