Added more descriptive names

For now we have the space.