Minor refactoring

Just renaming a couple things, moved collision index checking into the
same function as tiles; not much reason not to do it together (as far as
I'm aware it won't impact performance very much).