Cleanup and rename.

Signed-off-by: SkyFire <admin@projectskyfire.org>