Revert "try to add space support in collection names"

This reverts commit ed25e8066c58c41b714a6e94eac9e28810efee94.