Unify collision
- Also, remove the 4/1 joke.
- Make object names and locations more consistent... It's not like anybody else is touching these, right? Right?