readme and api naming cleanup