Refactored names of Space to EmptySpace