Rename + improved docs