Code cleanup (Shorter names)

Shortening some names where it makes sense. Simplifying and reducing all
over town.