Revert "Support spaces in names"

This reverts commit 1ed0dd3c460babf028be31848f28d013c6f7fd94.
Rename some files