Rename directory.
Fix collection API.