Rename for consistency
Add some docs