fix naming and docs