Apparent splash bug fix, cleaner names

Just girly things
And a bunch of quick fixes. Behavior is that on slightly modified rom,
the splash screen hangs/can't interact with the "Click to begin" screen.