Little bugfix.

Little bugfix.
Shortened some names.

Shortened some names. Preparing for core rewrite.