Name cleanup, docs