Naming

TODO: Insert things here about collision detection etc.